From 721e6524271af2d59385fcfc1c9f9093ef3e9ad9 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 2 Jul 2012 12:35:11 -0500 Subject: [svn-r22506] HDFFV-7782: resolve names of tests files with tests - added two copies of references files and adjusted CMake and linux test script. Tested: local linux w/ CMake --- MANIFEST | 60 ++++++++++++++++++----------------- tools/h5import/CMakeLists.txt | 8 +++-- tools/h5import/h5importtestutil.sh | 10 +++--- tools/h5import/testfiles/txtin8.txt | 15 +++++++++ tools/h5import/testfiles/txtuin16.txt | 15 +++++++++ 5 files changed, 72 insertions(+), 36 deletions(-) create mode 100644 tools/h5import/testfiles/txtin8.txt create mode 100644 tools/h5import/testfiles/txtuin16.txt diff --git a/MANIFEST b/MANIFEST index a291444..c103fe9 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1132,45 +1132,47 @@ ./tools/h5import/h5importtestutil.sh # testfiles for h5import -./tools/h5import/testfiles/binin32.h5 +./tools/h5import/testfiles/binfp64.conf +./tools/h5import/testfiles/binfp64.h5 +./tools/h5import/testfiles/binin16.conf ./tools/h5import/testfiles/binin16.h5 -./tools/h5import/testfiles/txtfp32.txt -./tools/h5import/testfiles/txtstr.conf -./tools/h5import/testfiles/txtfp32.conf -./tools/h5import/testfiles/binin8w.conf +./tools/h5import/testfiles/binin32.conf +./tools/h5import/testfiles/binin32.h5 +./tools/h5import/testfiles/binin8.conf ./tools/h5import/testfiles/binin8.h5 -./tools/h5import/testfiles/txtfp64.conf -./tools/h5import/testfiles/binuin32.conf -./tools/h5import/testfiles/txtuin32.txt +./tools/h5import/testfiles/binin8w.conf +./tools/h5import/testfiles/binin8w.h5 ./tools/h5import/testfiles/binuin16.conf -./tools/h5import/testfiles/txtstr.h5 +./tools/h5import/testfiles/binuin16.h5 +./tools/h5import/testfiles/binuin32.conf +./tools/h5import/testfiles/binuin32.h5 +./tools/h5import/testfiles/textpfe.conf +./tools/h5import/testfiles/textpfe.h5 +./tools/h5import/testfiles/textpfe64.txt +./tools/h5import/testfiles/txtfp32.conf ./tools/h5import/testfiles/txtfp32.h5 -./tools/h5import/testfiles/txtin32.h5 +./tools/h5import/testfiles/txtfp32.txt +./tools/h5import/testfiles/txtfp64.conf +./tools/h5import/testfiles/txtfp64.h5 +./tools/h5import/testfiles/txtfp64.txt +./tools/h5import/testfiles/txtin16.conf ./tools/h5import/testfiles/txtin16.h5 -./tools/h5import/testfiles/binin8w.h5 +./tools/h5import/testfiles/txtin16.txt +./tools/h5import/testfiles/txtin32.conf +./tools/h5import/testfiles/txtin32.h5 ./tools/h5import/testfiles/txtin32.txt -./tools/h5import/testfiles/binfp64.conf -./tools/h5import/testfiles/binin8.conf ./tools/h5import/testfiles/txtin8.conf -./tools/h5import/testfiles/binfp64.h5 -./tools/h5import/testfiles/txtstr.txt -./tools/h5import/testfiles/txtin32.conf -./tools/h5import/testfiles/txtin16.conf ./tools/h5import/testfiles/txtin8.h5 -./tools/h5import/testfiles/txtuin32.conf +./tools/h5import/testfiles/txtin8.txt ./tools/h5import/testfiles/txtuin16.conf -./tools/h5import/testfiles/binin32.conf -./tools/h5import/testfiles/binin16.conf -./tools/h5import/testfiles/txtfp64.h5 -./tools/h5import/testfiles/txtin16.txt -./tools/h5import/testfiles/txtfp64.txt -./tools/h5import/testfiles/binuin32.h5 -./tools/h5import/testfiles/binuin16.h5 -./tools/h5import/testfiles/txtuin32.h5 ./tools/h5import/testfiles/txtuin16.h5 -./tools/h5import/testfiles/textpfe.conf -./tools/h5import/testfiles/textpfe64.txt -./tools/h5import/testfiles/textpfe.h5 +./tools/h5import/testfiles/txtuin16.txt +./tools/h5import/testfiles/txtuin32.conf +./tools/h5import/testfiles/txtuin32.h5 +./tools/h5import/testfiles/txtuin32.txt +./tools/h5import/testfiles/txtstr.conf +./tools/h5import/testfiles/txtstr.h5 +./tools/h5import/testfiles/txtstr.txt # h5diff sources ./tools/h5diff/Makefile.am diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt index 0f0cc20..a96ebc4 100644 --- a/tools/h5import/CMakeLists.txt +++ b/tools/h5import/CMakeLists.txt @@ -52,7 +52,9 @@ IF (BUILD_TESTING) SET (HDF5_REFERENCE_TXT_FILES txtfp32.txt txtfp64.txt + txtuin16.txt txtuin32.txt + txtin8.txt txtin16.txt txtin32.txt textpfe64.txt @@ -203,19 +205,19 @@ IF (BUILD_TESTING) SET (last_test "H5IMPORT-h5importtest") # ----- TESTING "ASCII I32 rank 3 - Output BE " ; - ADD_H5_TEST (ASCII_I32 txtin16.txt txtin32.conf txtin32.h5) + ADD_H5_TEST (ASCII_I32 txtin32.txt txtin32.conf txtin32.h5) # ----- TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" ADD_H5_TEST (ASCII_I16 txtin16.txt txtin16.conf txtin16.h5) # ----- TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed " - ADD_H5_TEST (ASCII_I8 txtin16.txt txtin8.conf txtin8.h5) + ADD_H5_TEST (ASCII_I8 txtin8.txt txtin8.conf txtin8.h5) # ----- TESTING "ASCII UI32 - rank 3 - Output BE" ADD_H5_TEST (ASCII_UI32 txtuin32.txt txtuin32.conf txtuin32.h5) # ----- TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " - ADD_H5_TEST (ASCII_UI16 txtuin32.txt txtuin16.conf txtuin16.h5) + ADD_H5_TEST (ASCII_UI16 txtuin16.txt txtuin16.conf txtuin16.h5) # ----- TESTING "ASCII F32 - rank 3 - Output LE " ADD_H5_TEST (ASCII_F32 txtfp32.txt txtfp32.conf txtfp32.h5) diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh index 943b194..ab12b81 100755 --- a/tools/h5import/h5importtestutil.sh +++ b/tools/h5import/h5importtestutil.sh @@ -94,7 +94,9 @@ $SRC_H5IMPORT_TESTFILES/textpfe.conf $SRC_H5IMPORT_TESTFILES/txtstr.conf $SRC_H5IMPORT_TESTFILES/txtfp32.txt $SRC_H5IMPORT_TESTFILES/txtfp64.txt +$SRC_H5IMPORT_TESTFILES/txtuin1632.txt $SRC_H5IMPORT_TESTFILES/txtuin32.txt +$SRC_H5IMPORT_TESTFILES/txtin8.txt $SRC_H5IMPORT_TESTFILES/txtin16.txt $SRC_H5IMPORT_TESTFILES/txtin32.txt $SRC_H5IMPORT_TESTFILES/textpfe64.txt @@ -174,20 +176,20 @@ $RUNSERIAL ./h5importtest ################################################ TESTING "ASCII I32 rank 3 - Output BE " ; -TOOLTEST $TESTDIR/txtin16.txt -c $TESTDIR/txtin32.conf -o txtin32.h5 +TOOLTEST $TESTDIR/txtin32.txt -c $TESTDIR/txtin32.conf -o txtin32.h5 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 " -TOOLTEST $TESTDIR/txtin16.txt -c $TESTDIR/txtin8.conf -o txtin8.h5 +TOOLTEST $TESTDIR/txtin8.txt -c $TESTDIR/txtin8.conf -o txtin8.h5 TESTING "ASCII UI32 - rank 3 - Output BE" TOOLTEST $TESTDIR/txtuin32.txt -c $TESTDIR/txtuin32.conf -o txtuin32.h5 TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " -TOOLTEST $TESTDIR/txtuin32.txt -c $TESTDIR/txtuin16.conf -o txtuin16.h5 +TOOLTEST $TESTDIR/txtuin16.txt -c $TESTDIR/txtuin16.conf -o txtuin16.h5 TESTING "ASCII F32 - rank 3 - Output LE " TOOLTEST $TESTDIR/txtfp32.txt -c $TESTDIR/txtfp32.conf -o txtfp32.h5 @@ -230,7 +232,7 @@ TOOLTEST $TESTDIR/textpfe64.txt -c $TESTDIR/textpfe.conf -o textpfe.h5 -rm -f txtin32.txt txtin16.txt *.bin *.h5 +rm -f txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.h5 rm -rf tmp_testfiles else echo "** h5import or h5importtest not available ***" diff --git a/tools/h5import/testfiles/txtin8.txt b/tools/h5import/testfiles/txtin8.txt new file mode 100644 index 0000000..0688e9b --- /dev/null +++ b/tools/h5import/testfiles/txtin8.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/txtuin16.txt b/tools/h5import/testfiles/txtuin16.txt new file mode 100644 index 0000000..0688e9b --- /dev/null +++ b/tools/h5import/testfiles/txtuin16.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 -- cgit v0.12