summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--java/test/CMakeLists.txt16
-rw-r--r--java/test/h5ex_g_iterate.orig (renamed from java/test/h5ex_g_iterate.hdf)bin2928 -> 2928 bytes
-rw-r--r--java/test/junit.sh.in21
3 files changed, 22 insertions, 15 deletions
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index 938a15b..291284c 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -63,7 +63,6 @@ add_dependencies (${HDF5_JAVA_TEST_LIB_TARGET} ${HDF5_JAVA_HDF5_LIB_TARGET})
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
)
@@ -79,6 +78,13 @@ foreach (h5_file ${HDF_JAVA_TEST_FILES})
)
endforeach (h5_file ${HDF_JAVA_TEST_FILES})
+add_custom_command (
+ TARGET ${HDF5_JAVA_TEST_LIB_TARGET}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig ${PROJECT_BINARY_DIR}/h5ex_g_iterate.hdf
+)
+
if (WIN32)
set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
else (WIN32)
@@ -97,6 +103,14 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
endif(CMAKE_BUILD_TYPE MATCHES Debug)
add_test (
+ NAME JJUnit-interface-clearall-objects
+ COMMAND ${CMAKE_COMMAND}
+ -E remove
+ JUnit-interface.out
+ JUnit-interface.out.err
+)
+
+add_test (
NAME JUnit-interface
COMMAND "${CMAKE_COMMAND}"
-D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
diff --git a/java/test/h5ex_g_iterate.hdf b/java/test/h5ex_g_iterate.orig
index e462703..e462703 100644
--- a/java/test/h5ex_g_iterate.hdf
+++ b/java/test/h5ex_g_iterate.orig
Binary files differ
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 8de07e3..698dc5d 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -61,8 +61,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
$top_builddir/java/src/$JARFILE
"
LIST_DATA_FILES="
-$HDFTEST_HOME/h5ex_g_iterate.hdf
$HDFTEST_HOME/JUnit-interface.txt
+$HDFTEST_HOME/JUnit-interface.ert
"
expect="JUnit-interface.txt"
@@ -144,23 +144,16 @@ COPY_DATAFILES_TO_BLDDIR()
fi
fi
done
+ $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterate.hdf
}
CLEAN_DATAFILES_AND_BLDDIR()
{
- # skip rm if srcdir is same as destdir
- # this occurs when build/test performed in source dir and
- # make cp fail
- SDIR=`$DIRNAME $HDFTEST_HOME/h5ex_g_iterate.hdf`
- INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
- INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'`
- if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
- $RM $BLDDIR/*.hdf
- $RM $BLDDIR/*.out
- $RM $BLDDIR/*.err
- $RM $BLDDIR/*.ext
- $RM $BLDDIR/*.txt
- fi
+ $RM $BLDDIR/h5ex_g_iterate.hdf
+ $RM $BLDDIR/JUnit-interface.out
+ $RM $BLDDIR/JUnit-interface.err
+ $RM $BLDDIR/JUnit-interface.ext
+ $RM $BLDDIR/JUnit-interface.txt
}
# Print a line-line message left justified in a field of 70 characters