summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-09-25 15:46:41 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-09-25 15:46:41 (GMT)
commit64b3c0a9616a4266edb5129616b43810082dfb8b (patch)
treefbb7b9ae90f71e4e07b1b1bf7751d3139f149c6e
parentd1aa3ee4d7a6835208701647ad1a6d789cb68fc9 (diff)
downloadhdf5-64b3c0a9616a4266edb5129616b43810082dfb8b.zip
hdf5-64b3c0a9616a4266edb5129616b43810082dfb8b.tar.gz
hdf5-64b3c0a9616a4266edb5129616b43810082dfb8b.tar.bz2
[svn-r15698] renamed input text files to have the extension .txt
tested: linux
-rw-r--r--MANIFEST15
-rwxr-xr-xtools/h5import/h5importtestutil.sh16
-rwxr-xr-xtools/h5import/testfiles/fp1.txt (renamed from tools/h5import/testfiles/fp1)0
-rwxr-xr-xtools/h5import/testfiles/fp2.txt (renamed from tools/h5import/testfiles/fp2)0
-rwxr-xr-xtools/h5import/testfiles/in1.txt (renamed from tools/h5import/testfiles/in1)0
-rw-r--r--tools/h5import/testfiles/in16.txt15
-rw-r--r--tools/h5import/testfiles/in32.txt15
-rw-r--r--tools/h5import/testfiles/str.txt (renamed from tools/h5import/testfiles/txtstr)0
-rw-r--r--tools/h5import/testfiles/test14.h5 (renamed from tools/h5import/testfiles/teststr.h5)bin10240 -> 10240 bytes
-rw-r--r--tools/h5import/testfiles/textstr.conf (renamed from tools/h5import/testfiles/textstr)0
10 files changed, 46 insertions, 15 deletions
diff --git a/MANIFEST b/MANIFEST
index 70d2bb7..d8ea26a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -924,9 +924,9 @@
./tools/h5import/testfiles/binin8.conf
./tools/h5import/testfiles/binuin16.conf
./tools/h5import/testfiles/binuin32.conf
-./tools/h5import/testfiles/fp1
-./tools/h5import/testfiles/fp2
-./tools/h5import/testfiles/in1
+./tools/h5import/testfiles/fp1.txt
+./tools/h5import/testfiles/fp2.txt
+./tools/h5import/testfiles/in1.txt
./tools/h5import/testfiles/textfp32.conf
./tools/h5import/testfiles/textfp64.conf
./tools/h5import/testfiles/textin16.conf
@@ -947,13 +947,14 @@
./tools/h5import/testfiles/test11.h5
./tools/h5import/testfiles/test12.h5
./tools/h5import/testfiles/test13.h5
-./tools/h5import/testfiles/teststr.h5
+./tools/h5import/testfiles/test14.h5
./tools/h5import/testfiles/test15.h5
-./tools/h5import/testfiles/teststr.h5
-./tools/h5import/testfiles/textstr
-./tools/h5import/testfiles/txtstr
+./tools/h5import/testfiles/textstr.conf
+./tools/h5import/testfiles/str.txt
./tools/h5import/testfiles/textpfe.conf
./tools/h5import/testfiles/in64.txt
+./tools/h5import/testfiles/in32.txt
+./tools/h5import/testfiles/in16.txt
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index f7defe9..759a660 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -60,25 +60,25 @@ cp $srcdir/testfiles/*.h5 tmp_testfiles/
$RUNSERIAL ./h5importtest
TESTING "ASCII I32 rank 3 - Output BE " ;
-TOOLTEST in32.txt -c $srcdir/testfiles/textin32.conf -o test1.h5
+TOOLTEST $srcdir/testfiles/in32.txt -c $srcdir/testfiles/textin32.conf -o test1.h5
TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
-TOOLTEST in16.txt -c $srcdir/testfiles/textin16.conf -o test2.h5
+TOOLTEST $srcdir/testfiles/in16.txt -c $srcdir/testfiles/textin16.conf -o test2.h5
TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed "
-TOOLTEST in16.txt -c $srcdir/testfiles/textin8.conf -o test3.h5
+TOOLTEST $srcdir/testfiles/in16.txt -c $srcdir/testfiles/textin8.conf -o test3.h5
TESTING "ASCII UI32 - rank 3 - Output BE"
-TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin32.conf -o test4.h5
+TOOLTEST $srcdir/testfiles/in1.txt -c $srcdir/testfiles/textuin32.conf -o test4.h5
TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
-TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin16.conf -o test5.h5
+TOOLTEST $srcdir/testfiles/in1.txt -c $srcdir/testfiles/textuin16.conf -o test5.h5
TESTING "ASCII F32 - rank 3 - Output LE "
-TOOLTEST $srcdir/testfiles/fp1 -c $srcdir/testfiles/textfp32.conf -o test6.h5
+TOOLTEST $srcdir/testfiles/fp1.txt -c $srcdir/testfiles/textfp32.conf -o test6.h5
TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
-TOOLTEST $srcdir/testfiles/fp2 -c $srcdir/testfiles/textfp64.conf -o test7.h5
+TOOLTEST $srcdir/testfiles/fp2.txt -c $srcdir/testfiles/textfp64.conf -o test7.h5
TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
TOOLTEST bfp64 -c $srcdir/testfiles/binfp64.conf -o test8.h5
@@ -99,7 +99,7 @@ TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
TOOLTEST buin32 -c $srcdir/testfiles/binuin32.conf -o test13.h5
TESTING "STR"
-TOOLTEST $srcdir/testfiles/txtstr -c $srcdir/testfiles/textstr -o teststr.h5
+TOOLTEST $srcdir/testfiles/str.txt -c $srcdir/testfiles/textstr.conf -o test14.h5
TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
TOOLTEST $srcdir/testfiles/in64.txt -c $srcdir/testfiles/textpfe.conf -o test15.h5
diff --git a/tools/h5import/testfiles/fp1 b/tools/h5import/testfiles/fp1.txt
index 142c94f..142c94f 100755
--- a/tools/h5import/testfiles/fp1
+++ b/tools/h5import/testfiles/fp1.txt
diff --git a/tools/h5import/testfiles/fp2 b/tools/h5import/testfiles/fp2.txt
index 6c83dc3..6c83dc3 100755
--- a/tools/h5import/testfiles/fp2
+++ b/tools/h5import/testfiles/fp2.txt
diff --git a/tools/h5import/testfiles/in1 b/tools/h5import/testfiles/in1.txt
index 0688e9b..0688e9b 100755
--- a/tools/h5import/testfiles/in1
+++ b/tools/h5import/testfiles/in1.txt
diff --git a/tools/h5import/testfiles/in16.txt b/tools/h5import/testfiles/in16.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/h5import/testfiles/in16.txt
@@ -0,0 +1,15 @@
+ 83 85 87 89
+ 84 86 88 90
+ 85 87 89 91
+ 88 90 92 94
+ 89 91 93 95
+ 90 92 94 96
+ 93 95 97 99
+ 94 96 98 100
+ 95 97 99 101
+ 98 100 102 104
+ 99 101 103 105
+ 100 102 104 106
+ 103 105 107 109
+ 104 106 108 110
+ 105 107 109 111
diff --git a/tools/h5import/testfiles/in32.txt b/tools/h5import/testfiles/in32.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/h5import/testfiles/in32.txt
@@ -0,0 +1,15 @@
+ 83 85 87 89
+ 84 86 88 90
+ 85 87 89 91
+ 88 90 92 94
+ 89 91 93 95
+ 90 92 94 96
+ 93 95 97 99
+ 94 96 98 100
+ 95 97 99 101
+ 98 100 102 104
+ 99 101 103 105
+ 100 102 104 106
+ 103 105 107 109
+ 104 106 108 110
+ 105 107 109 111
diff --git a/tools/h5import/testfiles/txtstr b/tools/h5import/testfiles/str.txt
index 25be0a6..25be0a6 100644
--- a/tools/h5import/testfiles/txtstr
+++ b/tools/h5import/testfiles/str.txt
diff --git a/tools/h5import/testfiles/teststr.h5 b/tools/h5import/testfiles/test14.h5
index ceb0810..ceb0810 100644
--- a/tools/h5import/testfiles/teststr.h5
+++ b/tools/h5import/testfiles/test14.h5
Binary files differ
diff --git a/tools/h5import/testfiles/textstr b/tools/h5import/testfiles/textstr.conf
index 85079e0..85079e0 100644
--- a/tools/h5import/testfiles/textstr
+++ b/tools/h5import/testfiles/textstr.conf