Fix changes to reference files. Still need to add subset test.

1 files changed, 49 insertions, 35 deletions

diff --git a/tools/test/h5import/h5importtestutil.sh.in b/tools/test/h5import/h5importtestutil.sh.in
index 3bbe37b..2f8c837 100644
--- a/tools/test/h5import/h5importtestutil.sh.in
+++ b/tools/test/h5import/h5importtestutil.sh.in
@@ -86,13 +86,6 @@ $SRC_H5IMPORT_TESTFILES/textpfe.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5IMPORT_TESTFILES/binfp64.conf
-$SRC_H5IMPORT_TESTFILES/binin8.conf
-$SRC_H5IMPORT_TESTFILES/binin8w.conf
-$SRC_H5IMPORT_TESTFILES/binin16.conf
-$SRC_H5IMPORT_TESTFILES/binin32.conf
-$SRC_H5IMPORT_TESTFILES/binuin16.conf
-$SRC_H5IMPORT_TESTFILES/binuin32.conf
 $SRC_H5IMPORT_TESTFILES/txtfp32.conf
 $SRC_H5IMPORT_TESTFILES/txtfp64.conf
 $SRC_H5IMPORT_TESTFILES/txtin8.conf
@@ -142,10 +135,10 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-                
+
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -206,7 +199,7 @@ fi
 TOOLTEST2()
 {
 err=0
-$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -b tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -b FILE tmp_testfiles/$2 > d$2.dmp
 $RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
 $RUNSERIAL $H5DIFF_BIN -v d$2 tmp_testfiles/$2 $1 $1 > log2
 $CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
@@ -264,7 +257,28 @@ else
 fi
 }
 
-echo "" 
+# Same as TOOLTEST2 except for subsets
+# Use h5dump output as input to h5import for binary numbers
+# Use h5dump to verify results
+TOOLTEST5()
+{
+err=0
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -b FILE tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
+$RUNSERIAL $DUMPER_BIN -p d$2 tmp_testfiles/$2 $1 $1 > log2
+$CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
+
+cmp -s log1 log2 || err=1
+rm -f log1 log2
+if [ $err -eq 1 ]; then
+nerrors="` expr $nerrors + 1 `";
+  echo "*FAILED*"
+else
+  echo " PASSED"
+fi
+}
+
+echo ""
 echo "=============================="
 echo "H5IMPORT tests started"
 echo "=============================="
@@ -288,30 +302,30 @@ $RUNSERIAL ./h5importtest
 TESTING "ASCII I32 rank 3 - Output BE " ;
 TOOLTEST $TESTDIR/txtin32.txt -c $TESTDIR/txtin32.conf -o txtin32.h5
 
-TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
+TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
 TOOLTEST $TESTDIR/txtin16.txt -c $TESTDIR/txtin16.conf -o txtin16.h5
 
-TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed " 
+TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed "
 TOOLTEST $TESTDIR/txtin8.txt -c $TESTDIR/txtin8.conf  -o txtin8.h5
 
 
-TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
+TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
 TOOLTEST $TESTDIR/txtuin16.txt -c $TESTDIR/txtuin16.conf -o txtuin16.h5
 
-TESTING "ASCII UI32 - rank 3 - Output BE" 
+TESTING "ASCII UI32 - rank 3 - Output BE"
 TOOLTEST $TESTDIR/txtuin32.txt -c $TESTDIR/txtuin32.conf -o txtuin32.h5
 
 
-TESTING "ASCII F32 - rank 3 - Output LE " 
+TESTING "ASCII F32 - rank 3 - Output LE "
 TOOLTEST $TESTDIR/txtfp32.txt -c $TESTDIR/txtfp32.conf -o txtfp32.h5
 
-TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
+TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
 TOOLTEST $TESTDIR/txtfp64.txt -c $TESTDIR/txtfp64.conf -o txtfp64.h5
 
 
-TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
+TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
 TOOLTEST binfp64.bin -c $TESTDIR/binfp64.conf -o binfp64.h5
-TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
+TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
 if test $USE_FILTER_DEFLATE != "yes"; then
  SKIP "/fp/bin/64-bit" binfp64.h5
 else
@@ -319,53 +333,53 @@ else
 fi
 
 
-TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
+TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
 TOOLTEST binin8.bin -c $TESTDIR/binin8.conf -o binin8.h5
-TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
+TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
 if test $USE_FILTER_DEFLATE != "yes"; then
  SKIP "/int/bin/8-bit" binin8.h5
 else
  TOOLTEST2 "/int/bin/8-bit" binin8.h5
 fi
 
-TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
+TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
 TOOLTEST binin16.bin -c $TESTDIR/binin16.conf -o binin16.h5
-TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
+TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
 TOOLTEST2 "/int/bin/16-bit" binin16.h5
 
-TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
+TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
 TOOLTEST binin32.bin -c $TESTDIR/binin32.conf -o binin32.h5
-TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED " 
+TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED "
 TOOLTEST2 "/int/bin/32-bit" binin32.h5
 
 
-TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
+TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
 TOOLTEST binuin16.bin -c $TESTDIR/binuin16.conf -o binuin16.h5
-TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
+TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
 TOOLTEST2 "/int/buin/16-bit" binuin16.h5
 
-TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
+TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
 TOOLTEST binuin32.bin -c $TESTDIR/binuin32.conf -o binuin32.h5
-TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED " 
+TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED "
 TOOLTEST2 "/int/buin/32-bit" binuin32.h5
 
 
-TESTING "STR" 
+TESTING "STR"
 TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5
-TESTING "H5DUMP-STR" 
+TESTING "H5DUMP-STR"
 TOOLTEST4 "/mytext/data" txtstr.h5
 
 
-TESTING "BINARY I8 CR LF EOF" 
+TESTING "BINARY I8 CR LF EOF"
 TOOLTEST binin8w.bin -c $TESTDIR/binin8w.conf -o binin8w.h5
-TESTING "H5DUMP-BINARY I8 CR LF EOF" 
+TESTING "H5DUMP-BINARY I8 CR LF EOF"
 TOOLTEST2 "/dataset0" binin8w.h5
 
-TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE " 
+TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
 TOOLTEST $TESTDIR/textpfe64.txt -c $TESTDIR/textpfe.conf -o textpfe.h5
 
 
-rm -f  txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.dmp *.imp *.h5
+rm -f  txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.dmp *.conf *.imp *.h5
 rm -rf tmp_testfiles
 
 # Clean up temporary files/directories