diff options
Diffstat (limited to 'tools/h5import')
| -rw-r--r-- | tools/h5import/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | tools/h5import/h5importtestutil.sh | 10 | ||||
| -rw-r--r-- | tools/h5import/testfiles/textpfe.h5 (renamed from tools/h5import/testfiles/test15.h5) | bin | 2064 -> 2064 bytes | |||
| -rw-r--r-- | tools/h5import/testfiles/textpfe64.txt (renamed from tools/h5import/testfiles/in64.txt) | 0 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt index fb0c938..abd0b7d 100644 --- a/tools/h5import/CMakeLists.txt +++ b/tools/h5import/CMakeLists.txt @@ -54,7 +54,7 @@ IF (BUILD_TESTING) txtuin32.txt txtin16.txt txtin32.txt - in64.txt + textpfe64.txt txtstr.txt ) SET (HDF5_REFERENCE_TEST_FILES @@ -73,7 +73,7 @@ IF (BUILD_TESTING) txtuin16.h5 txtuin32.h5 txtstr.h5 - test15.h5 + textpfe.h5 ) FILE (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") @@ -247,7 +247,7 @@ IF (BUILD_TESTING) ADD_H5_TEST (BINARY_I8_EOF binin8w.bin binin8w.conf binin8w.h5) # ----- TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE " - ADD_H5_TEST (ASCII_F64_R1 in64.txt textpfe.conf test15.h5) + ADD_H5_TEST (ASCII_F64_R1 textpfe64.txt textpfe.conf textpfe.h5) ENDIF (BUILD_TESTING) diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh index a3ad057..c5d8d6c 100755 --- a/tools/h5import/h5importtestutil.sh +++ b/tools/h5import/h5importtestutil.sh @@ -72,7 +72,7 @@ $SRC_H5IMPORT_TESTFILES/txtin32.h5 $SRC_H5IMPORT_TESTFILES/txtuin16.h5 $SRC_H5IMPORT_TESTFILES/txtuin32.h5 $SRC_H5IMPORT_TESTFILES/txtstr.h5 -$SRC_H5IMPORT_TESTFILES/test15.h5 +$SRC_H5IMPORT_TESTFILES/textpfe.h5 " LIST_OTHER_TEST_FILES=" @@ -97,7 +97,7 @@ $SRC_H5IMPORT_TESTFILES/txtfp64.txt $SRC_H5IMPORT_TESTFILES/txtuin32.txt $SRC_H5IMPORT_TESTFILES/txtin16.txt $SRC_H5IMPORT_TESTFILES/txtin32.txt -$SRC_H5IMPORT_TESTFILES/in64.txt +$SRC_H5IMPORT_TESTFILES/textpfe64.txt $SRC_H5IMPORT_TESTFILES/txtstr.txt " @@ -170,7 +170,7 @@ $CP $TESTDIR/*.h5 ./tmp_testfiles/ $RUNSERIAL ./h5importtest ################################################ -### T H E T E S T S +### T H E T E S T S ################################################ TESTING "ASCII I32 rank 3 - Output BE " ; @@ -233,8 +233,8 @@ TOOLTEST $TESTDIR/in64.txt -c $TESTDIR/textpfe.conf -o test15.h5 rm -f txtin32.txt txtin16.txt *.bin *.h5 rm -rf tmp_testfiles else - echo "** h5import or h5importtest not available ***" - nerrors="` expr $nerrors + 1 `"; + echo "** h5import or h5importtest not available ***" + nerrors="` expr $nerrors + 1 `"; fi # diff --git a/tools/h5import/testfiles/test15.h5 b/tools/h5import/testfiles/textpfe.h5 Binary files differindex 213051d..213051d 100644 --- a/tools/h5import/testfiles/test15.h5 +++ b/tools/h5import/testfiles/textpfe.h5 diff --git a/tools/h5import/testfiles/in64.txt b/tools/h5import/testfiles/textpfe64.txt index f6dd7f4..f6dd7f4 100644 --- a/tools/h5import/testfiles/in64.txt +++ b/tools/h5import/testfiles/textpfe64.txt |