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

2 files changed, 49 insertions, 131 deletions

diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt
index 7bf79c5..adc9a04 100644
--- a/tools/test/perform/CMakeLists.txt
+++ b/tools/test/perform/CMakeLists.txt
@@ -1,44 +1,14 @@
 cmake_minimum_required (VERSION 3.12)
 project (HDF5_TOOLS_TEST_PERFORM C)
 
-# --------------------------------------------------------------------
-# Add the executables
-# --------------------------------------------------------------------
-
-if (HDF5_BUILD_PERFORM_STANDALONE)
-  #-- Adding test for h5perf_serial_alone - io_timer.c includes
-  set (h5perf_serial_alone_SOURCES
-      ${HDF5_TOOLS_DIR}/lib/io_timer.c
-      ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/sio_perf.c
-      ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/sio_engine.c
-      ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_standalone.c
-  )
-  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SOURCES})
-  target_include_directories (h5perf_serial_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_TOOLS_DIR}/lib;${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR};${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  if (NOT BUILD_SHARED_LIBS)
-    TARGET_C_PROPERTIES (h5perf_serial_alone STATIC)
-    target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
-  else ()
-    TARGET_C_PROPERTIES (h5perf_serial_alone SHARED)
-    target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
-  endif ()
-  set_target_properties (h5perf_serial_alone PROPERTIES FOLDER perform)
-  set_property (TARGET h5perf_serial_alone APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE)
-
-  #-----------------------------------------------------------------------------
-  # Add Target to clang-format
-  #-----------------------------------------------------------------------------
-  if (HDF5_ENABLE_FORMATTERS)
-    clang_format (HDF5_TOOLS_TEST_PERFORM_h5perf_serial_alone_FORMAT h5perf_serial_alone)
-  endif ()
-endif ()
-
-#-- Adding test for chunk
+#-----------------------------------------------------------------------------
+# chunk
+#-----------------------------------------------------------------------------
 set (chunk_SOURCES
     ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/chunk.c
 )
 add_executable(chunk ${chunk_SOURCES})
-target_include_directories (chunk PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (chunk PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (chunk STATIC)
   target_link_libraries (chunk PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -48,19 +18,18 @@ else ()
 endif ()
 set_target_properties (chunk PROPERTIES FOLDER perform)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TOOLS_TEST_PERFORM_chunk_FORMAT chunk)
 endif ()
 
-#-- Adding test for iopipe
+#-----------------------------------------------------------------------------
+# iopipe
+#-----------------------------------------------------------------------------
 set (iopipe_SOURCES
     ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/iopipe.c
 )
 add_executable (iopipe ${iopipe_SOURCES})
-target_include_directories (iopipe PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (iopipe PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (iopipe STATIC)
   target_link_libraries (iopipe PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -70,19 +39,18 @@ else ()
 endif ()
 set_target_properties (iopipe PROPERTIES FOLDER perform)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TOOLS_TEST_PERFORM_iopipe_FORMAT iopipe)
 endif ()
 
-#-- Adding test for chunk_cache
+#-----------------------------------------------------------------------------
+# chunk_cache
+#-----------------------------------------------------------------------------
 set (chunk_cache_SOURCES
     ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/chunk_cache.c
 )
 add_executable (chunk_cache ${chunk_cache_SOURCES})
-target_include_directories (chunk_cache PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (chunk_cache PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (chunk_cache STATIC)
   target_link_libraries (chunk_cache PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -92,19 +60,18 @@ else ()
 endif ()
 set_target_properties (chunk_cache PROPERTIES FOLDER perform)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TOOLS_TEST_PERFORM_chunk_cache_FORMAT chunk_cache)
 endif ()
 
-#-- Adding test for overhead
+#-----------------------------------------------------------------------------
+# overhead
+#-----------------------------------------------------------------------------
 set (overhead_SOURCES
     ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/overhead.c
 )
 add_executable (overhead ${overhead_SOURCES})
-target_include_directories (overhead PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (overhead PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (overhead STATIC)
   target_link_libraries (overhead PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -114,19 +81,18 @@ else ()
 endif ()
 set_target_properties (overhead PROPERTIES FOLDER perform)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TOOLS_TEST_PERFORM_overhead_FORMAT overhead)
 endif ()
 
-#-- Adding test for perf_meta
+#-----------------------------------------------------------------------------
+# perf_meta
+#-----------------------------------------------------------------------------
 set (perf_meta_SOURCES
     ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/perf_meta.c
 )
 add_executable (perf_meta ${perf_meta_SOURCES})
-target_include_directories (perf_meta PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (perf_meta PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (perf_meta STATIC)
   target_link_libraries (perf_meta PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -136,19 +102,18 @@ else ()
 endif ()
 set_target_properties (perf_meta PROPERTIES FOLDER perform)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TOOLS_TEST_PERFORM_perf_meta_FORMAT perf_meta)
 endif ()
 
-#-- Adding test for zip_perf
+#-----------------------------------------------------------------------------
+# zip_perf
+#-----------------------------------------------------------------------------
 set (zip_perf_SOURCES
     ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/zip_perf.c
 )
 add_executable (zip_perf ${zip_perf_SOURCES})
-target_include_directories (zip_perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (zip_perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 if (NOT BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (zip_perf STATIC)
   target_link_libraries (zip_perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_COMP_LIBS})
@@ -158,45 +123,10 @@ else ()
 endif ()
 set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TOOLS_TEST_PERFORM_zip_perf_FORMAT zip_perf)
 endif ()
 
-if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL)
-  if (HDF5_BUILD_PERFORM_STANDALONE)
-    #-- Adding test for h5perf
-    set (h5perf_alone_SOURCES
-        ${HDF5_TOOLS_DIR}/lib/io_timer.c
-        ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/pio_perf.c
-        ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/pio_engine.c
-        ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_standalone.c
-    )
-    add_executable (h5perf_alone ${h5perf_alone_SOURCES})
-    target_include_directories (h5perf_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_TOOLS_DIR}/lib;${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR};${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-    if (NOT BUILD_SHARED_LIBS)
-      TARGET_C_PROPERTIES (h5perf_alone STATIC)
-      target_link_libraries (h5perf_alone PRIVATE ${HDF5_LIB_TARGET} ${LINK_LIBS} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
-    else ()
-      TARGET_C_PROPERTIES (h5perf_alone SHARED)
-      target_link_libraries (h5perf_alone PRIVATE ${HDF5_LIBSH_TARGET} ${LINK_LIBS} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
-    endif ()
-    set_target_properties (h5perf_alone PROPERTIES FOLDER perform)
-    set_property (TARGET h5perf_alone
-        APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE
-    )
-
-    #-----------------------------------------------------------------------------
-    # Add Target to clang-format
-    #-----------------------------------------------------------------------------
-    if (HDF5_ENABLE_FORMATTERS)
-      clang_format (HDF5_TOOLS_TEST_PERFORM_h5perf_alone_FORMAT h5perf_alone)
-    endif ()
-  endif ()
-endif ()
-
 if (HDF5_TEST_TOOLS)
   include (CMakeTests.cmake)
 endif ()
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 ()