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

1 files changed, 25 insertions, 37 deletions

diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index 17f4b48..acfe169 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -23,12 +23,10 @@ add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf t
 # Add Tests
 #-----------------------------------------------------------------------------
 if (HDF5_TEST_SERIAL)
-  # Remove any output file left over from previous test run
-  add_test (
-      NAME PERFORM_h5perform-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
+  set (PERFORM_CLEANFILES
           chunk.h5
+          direct_write.h5
+          unix.raw
           iopipe.h5
           iopipe.raw
           x-diag-rd.dat
@@ -36,21 +34,21 @@ if (HDF5_TEST_SERIAL)
           x-rowmaj-rd.dat
           x-rowmaj-wr.dat
           x-gnuplot
-          h5perf_serial.txt
-          h5perf_serial.txt.err
-          chunk.txt
-          chunk.txt.err
-          iopipe.txt
-          iopipe.txt.err
-          overhead.txt
-          overhead.txt.err
-          perf_meta.txt
-          perf_meta.txt.err
-          zip_perf-h.txt
-          zip_perf-h.txt.err
-          zip_perf.txt
-          zip_perf.txt.err
   )
+  # Remove any output file left over from previous test run
+  add_test (
+      NAME PERFORM_h5perform-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove ${PERFORM_CLEANFILES}
+  )
+  set_tests_properties (PERFORM_h5perform-clear-objects PROPERTIES FIXTURES_SETUP clear_perform)
+
+  add_test (
+      NAME PERFORM_h5perform-clean-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove ${PERFORM_CLEANFILES}
+  )
+  set_tests_properties (PERFORM_h5perform-clean-objects PROPERTIES FIXTURES_CLEANUP clear_perform)
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
     add_test (NAME PERFORM_h5perf_serial COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial>)
@@ -69,13 +67,9 @@ if (HDF5_TEST_SERIAL)
   endif ()
   set_tests_properties (PERFORM_h5perf_serial PROPERTIES
       TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
-      DEPENDS "PERFORM_h5perform-clearall-objects"
+      FIXTURES_REQUIRED clear_perform
   )
 
-  if (HDF5_BUILD_PERFORM_STANDALONE)
-    add_test (NAME PERFORM_h5perf_serial_alone COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial_alone>)
-  endif ()
-
   if (HDF5_ENABLE_USING_MEMCHECKER)
     add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>)
   else ()
@@ -92,7 +86,7 @@ if (HDF5_TEST_SERIAL)
     )
   endif ()
   set_tests_properties (PERFORM_chunk PROPERTIES
-      DEPENDS "PERFORM_h5perform-clearall-objects"
+      FIXTURES_REQUIRED clear_perform
   )
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -111,7 +105,7 @@ if (HDF5_TEST_SERIAL)
     )
   endif ()
   set_tests_properties (PERFORM_iopipe PROPERTIES
-      DEPENDS "PERFORM_h5perform-clearall-objects"
+      FIXTURES_REQUIRED clear_perform
   )
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -130,7 +124,7 @@ if (HDF5_TEST_SERIAL)
     )
   endif ()
   set_tests_properties (PERFORM_overhead PROPERTIES
-      DEPENDS "PERFORM_h5perform-clearall-objects"
+      FIXTURES_REQUIRED clear_perform
   )
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -149,7 +143,7 @@ if (HDF5_TEST_SERIAL)
     )
   endif ()
   set_tests_properties (PERFORM_perf_meta PROPERTIES
-      DEPENDS "PERFORM_h5perform-clearall-objects"
+      FIXTURES_REQUIRED clear_perform
   )
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -168,7 +162,7 @@ if (HDF5_TEST_SERIAL)
     )
   endif ()
   set_tests_properties (PERFORM_zip_perf_help PROPERTIES
-      DEPENDS "PERFORM_h5perform-clearall-objects"
+      FIXTURES_REQUIRED clear_perform
   )
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -187,18 +181,12 @@ if (HDF5_TEST_SERIAL)
     )
   endif ()
   set_tests_properties (PERFORM_zip_perf PROPERTIES
-      DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects"
+      DEPENDS "PERFORM_zip_perf_help"
+      FIXTURES_REQUIRED clear_perform
   )
 endif ()
 
 if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL)
-  if (UNIX)
-    add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS})
-  endif ()
-
   add_test (NAME MPI_TEST_PERFORM_h5perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf> ${MPIEXEC_POSTFLAGS})
 
-  if (HDF5_BUILD_PERFORM_STANDALONE)
-    add_test (NAME MPI_TEST_PERFORM_h5perf_alone COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf_alone> ${MPIEXEC_POSTFLAGS})
-  endif ()
 endif ()