Merge/update CMake, presets,java and tools (#3393)

1 files changed, 41 insertions, 16 deletions

diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index 3e18d35..48ea0f5 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -120,23 +120,39 @@ else ()
 endif ()
 
 get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
-set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
+set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 set (CMAKE_JAVA_CLASSPATH ".")
 foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}")
 endforeach ()
 
 if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
+  add_test (
+    NAME JUnit-clear-objects
+    COMMAND ${CMAKE_COMMAND} -E remove
+        test.h5
+        testF2.h5
+        testPf00000.h5
+        testPf00001.h5
+    WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test
+  )
+  set_tests_properties (JUnit-clear-objects PROPERTIES FIXTURES_SETUP clear_JUnit)
+
+  add_test (
+    NAME JUnit-clean-objects
+    COMMAND ${CMAKE_COMMAND} -E remove
+        test.h5
+        testF2.h5
+        testPf00000.h5
+        testPf00001.h5
+    WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test
+  )
+  set_tests_properties (JUnit-clean-objects PROPERTIES FIXTURES_CLEANUP clear_JUnit)
+
   foreach (test_file ${HDF5_JAVA_TEST_SOURCES})
     set (TEST_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_${test_file}_JAR_FILE}")
 
     add_test (
-      NAME JUnit-${test_file}-clearall-objects
-      COMMAND ${CMAKE_COMMAND} -E remove
-          JUnit-${test_file}.out
-          JUnit-${test_file}.out.err
-    )
-    add_test (
         NAME JUnit-${test_file}
         COMMAND "${CMAKE_COMMAND}"
             -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
@@ -156,7 +172,8 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
     )
     set_tests_properties (JUnit-${test_file} PROPERTIES
         ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
-        DEPENDS "JUnit-${test_file}-clearall-objects"
+        FIXTURES_REQUIRED clear_JUnit
+        WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test
     )
   endforeach ()
 
@@ -169,13 +186,6 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
 
   macro (DO_VOL_TEST voltest volname volinfo volclasspath)
     #message(STATUS "${voltest}-${volname} with ${volinfo}")
-    add_test (
-        NAME JUnit-VOL-${volname}-${voltest}-clearall-objects
-        COMMAND ${CMAKE_COMMAND} -E remove
-            JUnit-VOL-${volname}-${voltest}.out
-            JUnit-VOL-${volname}-${voltest}.out.err
-        WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test/${volname}
-    )
     add_test (NAME JUnit-VOL-${volname}-${voltest}
         COMMAND "${CMAKE_COMMAND}"
             -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
@@ -196,7 +206,20 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
     )
     set_tests_properties (JUnit-VOL-${volname}-${voltest} PROPERTIES
         ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
-        DEPENDS "JUnit-VOL-${volname}-${voltest}-clearall-objects"
+        WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test/${volname}
+    )
+    add_test (
+        NAME JUnit-VOL-${volname}-${voltest}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            test.h5
+            testF2.h5
+            testPf00000.h5
+            testPf00001.h5
+        WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test/${volname}
+    )
+    set_tests_properties (JUnit-VOL-${volname}-${voltest}-clean-objects PROPERTIES
+        ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
+        DEPENDS "JUnit-VOL-${volname}-${voltest}"
         WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test/${volname}
     )
   endmacro ()
@@ -208,6 +231,8 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
         vol_pass_through2
     )
 
+    # native VOL = 0
+    # pass-through VOL = 1
     set (vol_native native)
     set (vol_pass_through1 "pass_through under_vol=0\;under_info={}")
     set (vol_pass_through2 "pass_through under_vol=505\;under_info={under_vol=0\;under_info={}}")