summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-02-11 18:12:19 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-02-11 18:12:19 (GMT)
commit6d7e33a41e74117b6581e5077b9c2744dc66ae9f (patch)
treea08265dc191a7eb800af5ba8a572935dc1a64e26
parentd1492955c5b4ea30f3ac77a9c62ca61e50e5e97d (diff)
downloadhdf5-6d7e33a41e74117b6581e5077b9c2744dc66ae9f.zip
hdf5-6d7e33a41e74117b6581e5077b9c2744dc66ae9f.tar.gz
hdf5-6d7e33a41e74117b6581e5077b9c2744dc66ae9f.tar.bz2
[svn-r14543] some of the generated text input files were dynamically generated by h5importtest on each test run,
others were in svn and used from that location (don't know why the difference) per windows developer (SW) request made all the used text input files to be in svn the binary files are obviously dynamically generated by h5importtest on each run tested: linux, solaris
-rw-r--r--MANIFEST7
-rwxr-xr-xtools/h5import/h5importtestutil.sh9
-rw-r--r--tools/h5import/testfiles/txtin16.txt15
-rw-r--r--tools/h5import/testfiles/txtin32.txt15
4 files changed, 38 insertions, 8 deletions
diff --git a/MANIFEST b/MANIFEST
index f67fc55..7ca7603 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1498,11 +1498,8 @@
./tools/h5import/testfiles/binuin16.h5
./tools/h5import/testfiles/txtuin32.h5
./tools/h5import/testfiles/txtuin16.h5
-
-
-
-
-
+./tools/h5import/testfiles/txtin32.txt
+./tools/h5import/testfiles/txtin16.txt
# h5diff sources
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index 13cca76..b869f0b 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -61,13 +61,16 @@ cp $srcdir/testfiles/*.h5 tmp_testfiles/
$RUNSERIAL ./h5importtest
TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
-TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
+#TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
+TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
TESTING "ASCII I32 rank 3 - Output BE " ;
-TOOLTEST txtin32.txt -c $srcdir/testfiles/txtin32.conf -o txtin32.h5
+#TOOLTEST txtin32.txt -c $srcdir/testfiles/txtin32.conf -o txtin32.h5
+TOOLTEST $srcdir/testfiles/txtin32.txt -c $srcdir/testfiles/txtin32.conf -o txtin32.h5
TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed "
-TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin8.conf -o txtin8.h5
+#TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin8.conf -o txtin8.h5
+TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin8.conf -o txtin8.h5
TESTING "ASCII UI32 - rank 3 - Output BE"
TOOLTEST $srcdir/testfiles/txtuin32.txt -c $srcdir/testfiles/txtuin32.conf -o txtuin32.h5
diff --git a/tools/h5import/testfiles/txtin16.txt b/tools/h5import/testfiles/txtin16.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/h5import/testfiles/txtin16.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/txtin32.txt b/tools/h5import/testfiles/txtin32.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/h5import/testfiles/txtin32.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