Merge of HDFFV-10845, 10529 from develop

3 files changed, 148 insertions, 68 deletions

diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index 8e965e7..234a621 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -20,24 +20,38 @@ set (testphdf5_SOURCES
 
 #-- Adding test for testhdf5
 add_executable (testphdf5 ${testphdf5_SOURCES})
-target_include_directories(testphdf5
+target_include_directories (testphdf5
     PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
 )
-TARGET_C_PROPERTIES (testphdf5 STATIC)
-target_link_libraries (testphdf5
-    PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"
-)
+if (NOT BUILD_SHARED_LIBS)
+  TARGET_C_PROPERTIES (testphdf5 STATIC)
+  target_link_libraries (testphdf5
+      PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"
+  )
+else ()
+  TARGET_C_PROPERTIES (testphdf5 SHARED)
+  target_link_libraries (testphdf5
+      PRIVATE ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"
+  )
+endif ()
 set_target_properties (testphdf5 PROPERTIES FOLDER test/par)
 
 MACRO (ADD_H5P_EXE file)
   add_executable (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c)
-  target_include_directories(${file}
+  target_include_directories (${file}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
   )
-  TARGET_C_PROPERTIES (${file} STATIC)
-  target_link_libraries (${file}
-      PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"
-  )
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (${file} STATIC)
+    target_link_libraries (${file}
+        PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"
+    )
+  else ()
+    TARGET_C_PROPERTIES (${file} SHARED)
+    target_link_libraries (${file}
+        PRIVATE ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"
+    )
+  endif ()
   set_target_properties (${file} PROPERTIES FOLDER test/par)
 ENDMACRO (ADD_H5P_EXE file)
 
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
index f731823..ad244b5 100644
--- a/testpar/CMakeTests.cmake
+++ b/testpar/CMakeTests.cmake
@@ -16,16 +16,34 @@
 ##############################################################################
 ##############################################################################
 # Remove any output file left over from previous test run
-add_test (NAME MPI_TEST-clear-testphdf5-objects
-    COMMAND    ${CMAKE_COMMAND}
-        -E remove
-        ParaTest.h5
-    WORKING_DIRECTORY
-        ${HDF5_TEST_PAR_BINARY_DIR}
+add_test (
+    NAME MPI_TEST-clear-testphdf5-objects
+    COMMAND ${CMAKE_COMMAND} -E remove ParaTest.h5
+    WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
 )
 set_tests_properties (MPI_TEST-clear-testphdf5-objects PROPERTIES FIXTURES_SETUP par_clear_testphdf5)
 
-add_test (NAME MPI_TEST_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS})
+set (SKIP_tests
+    cchunk1
+    cchunk2
+    cchunk3
+    cchunk4
+    ecdsetw
+    eidsetw2
+    selnone
+    cngrpw-ingrpr
+    cschunkw
+    ccchunkw
+    tldsc
+    actualio
+    MC_coll_MD_read
+)
+set (SKIP_testphdf5 "")
+foreach (skiptest ${SKIP_tests})
+  set (SKIP_testphdf5 "${SKIP_testphdf5};-x;${skiptest}")
+endforeach ()
+
+add_test (NAME MPI_TEST_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} ${SKIP_testphdf5})
 set_tests_properties (MPI_TEST_testphdf5 PROPERTIES
     FIXTURES_REQUIRED par_clear_testphdf5
     ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}"
@@ -36,6 +54,24 @@ if (last_test)
 endif ()
 set (last_test "MPI_TEST_testphdf5")
 
+#execute the skipped tests
+foreach (skiptest ${SKIP_tests})
+  add_test (NAME MPI_TEST_testphdf5_${skiptest} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} -o ${skiptest})
+  set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES
+      FIXTURES_REQUIRED par_clear_testphdf5
+      ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}"
+      WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
+  )
+  if (last_test)
+    set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES DEPENDS ${last_test})
+  endif ()
+  set (last_test "MPI_TEST_testphdf5_${skiptest}")
+endforeach ()
+
+#if (HDF5_OPENMPI_VERSION_SKIP)
+#  list (REMOVE_ITEM H5P_TESTS t_shapesame)
+#endif ()
+
 set (test_par_CLEANFILES
     t_cache_image_00.h5
     t_cache_image_01.h5
@@ -56,12 +92,10 @@ set (test_par_CLEANFILES
 )
 
 # Remove any output file left over from previous test run
-add_test (NAME MPI_TEST-clear-objects
-    COMMAND    ${CMAKE_COMMAND}
-        -E remove
-        ${test_par_CLEANFILES}
-    WORKING_DIRECTORY
-        ${HDF5_TEST_PAR_BINARY_DIR}
+add_test (
+    NAME MPI_TEST-clear-objects
+    COMMAND ${CMAKE_COMMAND} -E remove ${test_par_CLEANFILES}
+    WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
 )
 set_tests_properties (MPI_TEST-clear-objects PROPERTIES FIXTURES_SETUP par_clear_objects)
 
@@ -78,52 +112,18 @@ foreach (h5_testp ${H5P_TESTS})
   set (last_test "MPI_TEST_${h5_testp}")
 endforeach ()
 
-# The following will only be correct on windows shared
-#set_tests_properties (MPI_TEST_t_pflush1 PROPERTIES WILL_FAIL "true")
-set_property (TEST MPI_TEST_t_pflush1 PROPERTY PASS_REGULAR_EXPRESSION "PASSED")
+# The t_pflush1 test is hard-coded to fail.
+set_tests_properties (MPI_TEST_t_pflush1 PROPERTIES WILL_FAIL "true")
+#set_property (TEST MPI_TEST_t_pflush1 PROPERTY PASS_REGULAR_EXPRESSION "PASSED")
 set_tests_properties (MPI_TEST_t_pflush2 PROPERTIES DEPENDS MPI_TEST_t_pflush1)
+set_tests_properties (MPI_TEST_t_prestart PROPERTIES DEPENDS MPI_TEST_t_pshutdown)
 
-if (HDF5_TEST_VFD)
-
-  set (VFD_LIST
-      sec2
-      stdio
-      core
-      split
-      multi
-      family
-  )
-
-  set (H5P_VFD_TESTS
-      t_pflush1
-      t_pflush2
-  )
-
-  if (DIRECT_VFD)
-    set (VFD_LIST ${VFD_LIST} direct)
-  endif ()
-
-  macro (ADD_VFD_TEST vfdname resultcode)
-    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      foreach (test ${H5P_VFD_TESTS})
-        add_test (
-          NAME TEST_PAR_VFD-${vfdname}-${test}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:${test}>"
-              -D "TEST_ARGS:STRING="
-              -D "TEST_VFD:STRING=${vfdname}"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_OUTPUT=${test}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-              -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
-        )
-      endforeach ()
-    endif ()
-  endmacro ()
-
-  # Run test with different Virtual File Driver
-  foreach (vfd ${VFD_LIST})
-    ADD_VFD_TEST (${vfd} 0)
-  endforeach ()
+##############################################################################
+##############################################################################
+###                         V F D   T E S T S                              ###
+##############################################################################
+##############################################################################
 
+if (HDF5_TEST_VFD)
+  include (CMakeVFDTests.cmake)
 endif ()
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake
new file mode 100644
index 0000000..7db99de
--- /dev/null
+++ b/testpar/CMakeVFDTests.cmake
@@ -0,0 +1,66 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+##############################################################################
+##############################################################################
+###           T E S T I N G                                                ###
+##############################################################################
+##############################################################################
+  set (VFD_LIST
+      sec2
+      stdio
+      core
+      split
+      multi
+      family
+  )
+
+  set (H5P_VFD_TESTS
+      t_pflush1
+      t_pflush2
+  )
+
+  if (DIRECT_VFD)
+    set (VFD_LIST ${VFD_LIST} direct)
+  endif ()
+
+foreach (vfdtest ${VFD_LIST})
+  file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
+endforeach ()
+
+  macro (ADD_VFD_TEST vfdname resultcode)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      foreach (h5_test ${H5P_VFD_TESTS})
+        add_test (
+          NAME MPI_TEST_VFD-${vfdname}-${h5_test}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:${h5_test}>"
+              -D "TEST_ARGS:STRING="
+              -D "TEST_VFD:STRING=${vfdname}"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_OUTPUT=${vfdname}-${h5_test}.out"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
+              -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
+        )
+        set_tests_properties (MPI_TEST_VFD-${vfdname}-${h5_test} PROPERTIES
+            ENVIRONMENT "srcdir=${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}"
+            WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}
+        )
+      endforeach ()
+    endif ()
+  endmacro ()
+
+  # Run test with different Virtual File Driver
+  foreach (h5_vfd ${VFD_LIST})
+    ADD_VFD_TEST (${h5_vfd} 0)
+  endforeach ()