summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/test/CMakeLists.txt2
-rw-r--r--java/test/JUnit-interface.ert2
-rw-r--r--java/test/JUnit-interface.txt2
-rw-r--r--java/test/junit.sh.in1
4 files changed, 4 insertions, 3 deletions
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"