summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-02-11 18:43:21 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-02-11 18:43:21 (GMT)
commitd48aa9b23663ebfcd21942d5bf5cd967aa760e88 (patch)
treeb7faf89b739e0c4bf0d3f2f85c63acc87156fc0d
parent6d7e33a41e74117b6581e5077b9c2744dc66ae9f (diff)
downloadhdf5-d48aa9b23663ebfcd21942d5bf5cd967aa760e88.zip
hdf5-d48aa9b23663ebfcd21942d5bf5cd967aa760e88.tar.gz
hdf5-d48aa9b23663ebfcd21942d5bf5cd967aa760e88.tar.bz2
[svn-r14546] txtin32.txt and txtin16.txt actually contain the same data, so just use one of them and remove the other from svn
tested: linux, solaris
-rw-r--r--MANIFEST1
-rwxr-xr-xtools/h5import/h5importtestutil.sh5
-rw-r--r--tools/h5import/testfiles/txtin32.txt15
3 files changed, 1 insertions, 20 deletions
diff --git a/MANIFEST b/MANIFEST
index 7ca7603..3edcd92 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1498,7 +1498,6 @@
./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
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index b869f0b..2183abf 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -61,15 +61,12 @@ 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 $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 $srcdir/testfiles/txtin32.txt -c $srcdir/testfiles/txtin32.conf -o txtin32.h5
+TOOLTEST $srcdir/testfiles/txtin16.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 $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin8.conf -o txtin8.h5
TESTING "ASCII UI32 - rank 3 - Output BE"
diff --git a/tools/h5import/testfiles/txtin32.txt b/tools/h5import/testfiles/txtin32.txt
deleted file mode 100644
index 0688e9b..0000000
--- a/tools/h5import/testfiles/txtin32.txt
+++ /dev/null
@@ -1,15 +0,0 @@
- 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