Merge branch 'develop' into bugfix/repack_external_storage

2 files changed, 52 insertions, 158 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2239d64..0c1157f 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -41,32 +41,29 @@ set (examples
 
 foreach (example ${examples})
   add_executable (${example} ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
-  target_include_directories(${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (${example} STATIC)
-  target_link_libraries (${example} PRIVATE ${HDF5_LIB_TARGET})
-  set_target_properties (${example} PROPERTIES FOLDER examples)
-  if (BUILD_SHARED_LIBS)
-    add_executable (${example}-shared ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
-    target_include_directories(${example}-shared PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-    TARGET_C_PROPERTIES (${example}-shared SHARED)
-    target_link_libraries (${example}-shared PRIVATE ${HDF5_LIBSH_TARGET})
-    set_target_properties (${example}-shared PROPERTIES FOLDER examples)
+  target_include_directories (${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (${example} STATIC)
+    target_link_libraries (${example} PRIVATE ${HDF5_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (${example} SHARED)
+    target_link_libraries (${example} PRIVATE ${HDF5_LIBSH_TARGET})
   endif ()
+    target_link_libraries (${example} PRIVATE ${HDF5_LIB_TARGET})
+  set_target_properties (${example} PROPERTIES FOLDER examples)
 endforeach ()
 
 if (H5_HAVE_PARALLEL)
   add_executable (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
-  target_include_directories(ph5example PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (ph5example STATIC)
-  target_link_libraries (ph5example PRIVATE ${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
-  set_target_properties (ph5example PROPERTIES FOLDER examples)
-  if (BUILD_SHARED_LIBS)
-    add_executable (ph5example-shared ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
-    target_include_directories(ph5example-shared PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-    TARGET_C_PROPERTIES (ph5example-shared SHARED)
-    target_link_libraries (ph5example-shared PRIVATE ${HDF5_LIBSH_TARGET} ${MPI_C_LIBRARIES})
-    set_target_properties (ph5example-shared PROPERTIES FOLDER examples)
+  target_include_directories (ph5example PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (ph5example STATIC)
+    target_link_libraries (ph5example PRIVATE ${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
+  else ()
+    TARGET_C_PROPERTIES (ph5example SHARED)
+    target_link_libraries (ph5example PRIVATE ${HDF5_LIBSH_TARGET} ${MPI_C_LIBRARIES})
   endif ()
+  set_target_properties (ph5example PROPERTIES FOLDER examples)
 endif ()
 
 if (BUILD_TESTING)
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index 1058566..6cab7dd 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -16,93 +16,8 @@
 ##############################################################################
 ##############################################################################
   file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w)
-  if (BUILD_SHARED_LIBS)
-    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5EX-shared")
-    file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/H5EX-shared/red ${PROJECT_BINARY_DIR}/H5EX-shared/blue ${PROJECT_BINARY_DIR}/H5EX-shared/u2w)
-  endif ()
-
-  # Remove any output file left over from previous test run
-  add_test (
-      NAME EXAMPLES-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          Attributes.h5
-          btrees_file.h5
-          cmprss.h5
-          default_file.h5
-          dset.h5
-          extend.h5
-          extlink_prefix_source.h5
-          extlink_source.h5
-          extlink_target.h5
-          group.h5
-          groups.h5
-          hard_link.h5
-          mount1.h5
-          mount2.h5
-          one_index_file.h5
-          only_dspaces_and_attrs_file.h5
-          only_huge_mesgs_file.h5
-          REF_REG.h5
-          refere.h5
-          SDS.h5
-          SDScompound.h5
-          SDSextendible.h5
-          Select.h5
-          separate_indexes_file.h5
-          small_lists_file.h5
-          soft_link.h5
-          subset.h5
-          unix2win.h5
-          blue/prefix_target.h5
-          red/prefix_target.h5
-          u2w/u2w_target.h5
-          vds.h5
-          vds-exc.h5
-          vds-excalibur.h5
-          vds-exclim.h5
-          vds-percival.h5
-          vds-percival-unlim.h5
-          vds-percival-unlim-maxmin.h5
-          a.h5
-          b.h5
-          c.h5
-          d.h5
-          vds-simpleIO.h5
-          vds-eiger.h5
-  )
-  if (last_test)
-    set_tests_properties (EXAMPLES-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "EXAMPLES-clear-objects")
-
-  foreach (example ${examples})
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME EXAMPLES-${example} COMMAND $<TARGET_FILE:${example}>)
-    else ()
-      add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
-          -D "TEST_ARGS:STRING="
-          -D "TEST_EXPECT=0"
-          -D "TEST_SKIP_COMPARE=TRUE"
-          -D "TEST_OUTPUT=${example}.txt"
-          #-D "TEST_REFERENCE=${example}.out"
-          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-    endif ()
-    if (last_test)
-      set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "EXAMPLES-${example}")
-  endforeach ()
 
-  if (BUILD_SHARED_LIBS)
-    # Remove any output file left over from previous test run
-    add_test (
-        NAME EXAMPLES-shared-clear-objects
-        COMMAND    ${CMAKE_COMMAND}
-            -E remove
+  set (test_CLEANFILES
             Attributes.h5
             btrees_file.h5
             cmprss.h5
@@ -131,6 +46,9 @@
             soft_link.h5
             subset.h5
             unix2win.h5
+            blue/prefix_target.h5
+            red/prefix_target.h5
+            u2w/u2w_target.h5
             vds.h5
             vds-exc.h5
             vds-excalibur.h5
@@ -144,39 +62,39 @@
             d.h5
             vds-simpleIO.h5
             vds-eiger.h5
-            blue/prefix_target.h5
-            red/prefix_target.h5
-            u2w/u2w_target.h5
-        WORKING_DIRECTORY
-            ${PROJECT_BINARY_DIR}/H5EX-shared
-    )
-    if (last_test)
-      set_tests_properties (EXAMPLES-shared-clear-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "EXAMPLES-shared-clear-objects")
+  )
 
-    foreach (example ${examples})
-      if (HDF5_ENABLE_USING_MEMCHECKER)
-        add_test (NAME EXAMPLES-shared-${example} COMMAND $<TARGET_FILE:${example}-shared>)
-      else ()
-        add_test (NAME EXAMPLES-shared-${example} COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
-            -D "TEST_ARGS:STRING="
-            -D "TEST_EXPECT=0"
-            -D "TEST_SKIP_COMPARE=TRUE"
-            -D "TEST_OUTPUT=${example}.txt"
-            #-D "TEST_REFERENCE=${example}.out"
-            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5EX-shared"
-            -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-        )
-      endif ()
-      set_tests_properties (EXAMPLES-shared-${example} PROPERTIES WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/H5EX-shared)
-      if (last_test)
-        set_tests_properties (EXAMPLES-shared-${example} PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "EXAMPLES-shared-${example}")
-    endforeach ()
+  # Remove any output file left over from previous test run
+  add_test (
+      NAME EXAMPLES-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove ${test_CLEANFILES}
+  )
+  if (last_test)
+    set_tests_properties (EXAMPLES-clear-objects PROPERTIES DEPENDS ${last_test})
   endif ()
+  set (last_test "EXAMPLES-clear-objects")
+
+  foreach (example ${examples})
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME EXAMPLES-${example} COMMAND $<TARGET_FILE:${example}>)
+    else ()
+      add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=${example}.txt"
+          #-D "TEST_REFERENCE=${example}.out"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+    endif ()
+    if (last_test)
+      set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
+    endif ()
+    set (last_test "EXAMPLES-${example}")
+  endforeach ()
 
 ### Windows pops up a modal permission dialog on this test
   if (H5_HAVE_PARALLEL AND NOT WIN32)
@@ -198,25 +116,4 @@
       set_tests_properties (MPI_TEST_EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test})
     endif ()
     set (last_test "MPI_TEST_EXAMPLES-ph5example")
-    if (BUILD_SHARED_LIBS)
-      if (HDF5_ENABLE_USING_MEMCHECKER)
-        add_test (NAME MPI_TEST_EXAMPLES-shared-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example-shared> ${MPIEXEC_POSTFLAGS})
-      else ()
-        add_test (NAME MPI_TEST_EXAMPLES-shared-ph5example COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example-shared>;${MPIEXEC_POSTFLAGS}"
-            -D "TEST_ARGS:STRING="
-            -D "TEST_EXPECT=0"
-            -D "TEST_OUTPUT=ph5example-shared.out"
-            -D "TEST_REFERENCE:STRING=PHDF5 tests finished with no errors"
-            -D "TEST_FILTER:STRING=PHDF5 tests finished with no errors"
-            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5EX-shared"
-            -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
-        )
-      endif ()
-      set_tests_properties (MPI_TEST_EXAMPLES-shared-ph5example PROPERTIES WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/H5EX-shared)
-      if (last_test)
-        set_tests_properties (MPI_TEST_EXAMPLES-shared-ph5example PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "MPI_TEST_EXAMPLES-shared-ph5example")
-    endif ()
   endif ()