diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | config/cmake/jrunTest.cmake | 8 | ||||
| -rw-r--r-- | java/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/test/JUnit-interface.ert | 2 | ||||
| -rw-r--r-- | java/test/JUnit-interface.txt | 2 | ||||
| -rw-r--r-- | java/test/junit.sh.in | 1 |
6 files changed, 9 insertions, 7 deletions
@@ -2690,6 +2690,7 @@ ./java/test/CMakeLists.txt ./java/test/junit.sh.in ./java/test/JUnit-interface.txt +./java/test/JUnit-interface.ert ./java/test/h5ex_g_iterate.hdf ./java/test/TestH5.java ./java/test/TestH5A.java diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake index 7a92867..6c9bbdd 100644 --- a/config/cmake/jrunTest.cmake +++ b/config/cmake/jrunTest.cmake @@ -72,9 +72,9 @@ endif (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err) if (TEST_MASK_ERROR) if (NOT TEST_ERRREF) - file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) - else (NOT TEST_ERRREF) file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM) + else (NOT TEST_ERRREF) + file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) endif (NOT TEST_ERRREF) string (REGEX REPLACE "Time:[^\n]+\n" "Time: XXXX\n" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}") @@ -85,9 +85,9 @@ if (TEST_MASK_ERROR) string (REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") if (NOT TEST_ERRREF) - file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") - else (NOT TEST_ERRREF) file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}") + else (NOT TEST_ERRREF) + file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") endif (NOT TEST_ERRREF) endif (TEST_MASK_ERROR) diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 2632b18..938a15b 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -65,6 +65,7 @@ set_target_properties (${HDF5_JAVA_TEST_LIB_TARGET} PROPERTIES FOLDER test/java) set (HDF_JAVA_TEST_FILES h5ex_g_iterate.hdf JUnit-interface.txt + JUnit-interface.ert ) foreach (h5_file ${HDF_JAVA_TEST_FILES}) @@ -105,6 +106,7 @@ add_test ( -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test" -D "TEST_OUTPUT=JUnit-interface.out" + -D "TEST_ERRREF=JUnit-interface.ert" # -D "TEST_LOG_LEVEL=trace" -D "TEST_EXPECT=0" -D "TEST_MASK_ERROR=TRUE" diff --git a/java/test/JUnit-interface.ert b/java/test/JUnit-interface.ert new file mode 100644 index 0000000..5771a4f --- /dev/null +++ b/java/test/JUnit-interface.ert @@ -0,0 +1,2 @@ +[main] INFO hdf.hdf5lib.H5 - HDF5 library: hdf5_java +[main] INFO hdf.hdf5lib.H5 - successfully loaded from java.library.path diff --git a/java/test/JUnit-interface.txt b/java/test/JUnit-interface.txt index f065dd4..12e67ad 100644 --- a/java/test/JUnit-interface.txt +++ b/java/test/JUnit-interface.txt @@ -648,5 +648,3 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #002: (file name) line (number) in H5P_isa_class(): not a property list major: Invalid arguments to routine minor: Inappropriate type -[main] INFO hdf.hdf5lib.H5 - HDF5 library: hdf5_java -[main] INFO hdf.hdf5lib.H5 - successfully loaded from java.library.path diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index c05e502..94b3415 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -237,7 +237,6 @@ sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \ -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \ -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \ $actual_ext > $actual -cat $actual_err >> $actual if $CMP $expect $actual; then echo " PASSED" |