HDFFV-10845 More changes from 1.10 branch

3 files changed, 89 insertions, 57 deletions

diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index 7bd9694..ace9306 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -37,16 +37,22 @@ set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 configure_file (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ONLY)
 
 add_executable (cpp_testhdf5 ${CPP_TEST_SOURCES} )
-target_include_directories(cpp_testhdf5 PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (cpp_testhdf5 PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 target_compile_definitions(cpp_testhdf5
     PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
 )
-TARGET_C_PROPERTIES (cpp_testhdf5 STATIC)
-target_link_libraries (cpp_testhdf5 PRIVATE
-    ${HDF5_CPP_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-    ${HDF5_TEST_LIB_TARGET}
-)
+if (NOT BUILD_SHARED_LIBS)
+  TARGET_C_PROPERTIES (cpp_testhdf5 STATIC)
+  target_link_libraries (cpp_testhdf5 PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+else ()
+  TARGET_C_PROPERTIES (cpp_testhdf5 SHARED)
+  target_link_libraries (cpp_testhdf5 PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
+  if (MINGW)
+    target_link_options (${HDF5_CPP_LIBSH_TARGET}
+        PRIVATE -static-libgcc -static-libstdc++
+    )
+  endif ()
+endif ()
 set_target_properties (cpp_testhdf5 PROPERTIES FOLDER test/cpp)
 
 include (CMakeTests.cmake)
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake
index 11463a0..d3b1f56 100644
--- a/c++/test/CMakeTests.cmake
+++ b/c++/test/CMakeTests.cmake
@@ -31,9 +31,10 @@ add_test (
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME CPP_testhdf5 COMMAND $<TARGET_FILE:cpp_testhdf5>)
+  add_test (NAME CPP_testhdf5 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_testhdf5>)
 else ()
   add_test (NAME CPP_testhdf5 COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -46,54 +47,12 @@ else ()
 endif ()
 set_tests_properties (CPP_testhdf5 PROPERTIES DEPENDS CPP_testhdf5-clear-objects)
 
-if (HDF5_TEST_VFD)
-
-  set (VFD_LIST
-      sec2
-      stdio
-      core
-      split
-      multi
-      family
-  )
-
-  if (DIRECT_VFD)
-    set (VFD_LIST ${VFD_LIST} direct)
-  endif ()
-
-  macro (ADD_VFD_TEST vfdname resultcode)
-    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}")
-      add_test (
-          NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  tattr_basic.h5
-                  tattr_compound.h5
-                  tattr_dtype.h5
-                  tattr_multi.h5
-                  tattr_scalar.h5
-                  tfattrs.h5
-      )
-      add_test (
-        NAME CPP_VFD-${vfdname}-cpp_testhdf5
-        COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
-            -D "TEST_ARGS:STRING="
-            -D "TEST_VFD:STRING=${vfdname}"
-            -D "TEST_EXPECT=${resultcode}"
-            -D "TEST_OUTPUT=cpp_testhdf5"
-            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
-            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
-      )
-      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects)
-      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT 30)
-    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/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake
new file mode 100644
index 0000000..b26165a
--- /dev/null
+++ b/c++/test/CMakeVFDTests.cmake
@@ -0,0 +1,67 @@
+#
+# 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
+  )
+
+  if (DIRECT_VFD)
+    set (VFD_LIST ${VFD_LIST} direct)
+  endif ()
+
+  macro (ADD_VFD_TEST vfdname resultcode)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}")
+      add_test (
+          NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+                  tattr_basic.h5
+                  tattr_compound.h5
+                  tattr_dtype.h5
+                  tattr_multi.h5
+                  tattr_scalar.h5
+                  tfattrs.h5
+                  titerate.h5
+          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${vfdname}
+      )
+      add_test (
+        NAME CPP_VFD-${vfdname}-cpp_testhdf5
+        COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+            -D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
+            -D "TEST_ARGS:STRING="
+            -D "TEST_VFD:STRING=${vfdname}"
+            -D "TEST_EXPECT=${resultcode}"
+            -D "TEST_OUTPUT=${vfdname}-cpp_testhdf5.out"
+            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
+            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
+      )
+      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects)
+      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT})
+    endif ()
+  endmacro ()
+
+  # Run test with different Virtual File Driver
+  foreach (vfd ${VFD_LIST})
+    ADD_VFD_TEST (${vfd} 0)
+  endforeach ()