Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,

including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and
I share.

Now I need to put this branch on a fork with a less confusing name than
vchoi_fork!

1 files changed, 51 insertions, 119 deletions

diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake
index c3d94b4..5e7dfa8 100644
--- a/fortran/examples/CMakeTests.cmake
+++ b/fortran/examples/CMakeTests.cmake
@@ -16,63 +16,37 @@
 ##############################################################################
 ##############################################################################
 
-  # Remove any output file left over from previous test run
-  add_test (
-      NAME f90_ex-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          compound.h5
-          copy1.h5
-          copy2.h5
-          dsetf.h5
-          extend.h5
-          FORTRAN.h5
-          groupf.h5
-          groupsf.h5
-          h5_cmprss.h5
-          mount1.h5
-          mount2.h5
-          sdsf.h5
-          subset.h5
-          SDScompound.h5
-          test.h5
-  )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "f90_ex-clear-objects")
-  if (BUILD_SHARED_LIBS)
-    add_test (
-        NAME f90_ex-shared-clear-objects
-        COMMAND    ${CMAKE_COMMAND}
-            -E remove
-            compound.h5
-            copy1.h5
-            copy2.h5
-            dsetf.h5
-            extend.h5
-            FORTRAN.h5
-            groupf.h5
-            groupsf.h5
-            h5_cmprss.h5
-            mount1.h5
-            mount2.h5
-            sdsf.h5
-            subset.h5
-            SDScompound.h5
-            test.h5
-    )
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (f90_ex-shared-clear-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "f90_ex-shared-clear-objects")
-  endif ()
+set (test_ex_fortran_CLEANFILES
+    compound.h5
+    copy1.h5
+    copy2.h5
+    dsetf.h5
+    extend.h5
+    FORTRAN.h5
+    groupf.h5
+    groupsf.h5
+    h5_cmprss.h5
+    mount1.h5
+    mount2.h5
+    sdsf.h5
+    subset.h5
+    SDScompound.h5
+    test.h5
+)
+
+# Remove any output file left over from previous test run
+add_test (
+    NAME f90_ex-clear-objects
+    COMMAND ${CMAKE_COMMAND} -E remove ${test_ex_fortran_CLEANFILES}
+)
+set_tests_properties (f90_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_f90_ex)
 
 foreach (example ${examples})
   if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME f90_ex_${example} COMMAND $<TARGET_FILE:f90_ex_${example}>)
+    add_test (NAME f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f90_ex_${example}>)
   else ()
     add_test (NAME f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
         -D "TEST_PROGRAM=$<TARGET_FILE:f90_ex_${example}>"
         -D "TEST_ARGS:STRING="
         -D "TEST_EXPECT=0"
@@ -83,78 +57,36 @@ foreach (example ${examples})
         -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
     )
   endif ()
-  if (NOT "${last_test}" STREQUAL "")
+  set_tests_properties (f90_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
+  if (last_test)
     set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
   endif ()
   set (last_test "f90_ex_${example}")
-  if (BUILD_SHARED_LIBS)
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME f90_ex-shared_${example} COMMAND $<TARGET_FILE:f90_ex_${example}-shared>)
-    else ()
-      add_test (NAME f90_ex-shared_${example} COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:f90_ex_${example}-shared>"
-          -D "TEST_ARGS:STRING="
-          -D "TEST_EXPECT=0"
-          -D "TEST_SKIP_COMPARE=TRUE"
-          -D "TEST_OUTPUT=f90_ex_${example}-shared.txt"
-          #-D "TEST_REFERENCE=f90_ex_${example}-shared.out"
-          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-    endif ()
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (f90_ex-shared_${example} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "f90_ex-shared_${example}")
-  endif ()
 endforeach ()
 
-if (HDF5_ENABLE_F2003)
-  foreach (example ${F2003_examples})
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME f03_ex_${example} COMMAND $<TARGET_FILE:f03_ex_${example}>)
-    else ()
-      add_test (NAME f03_ex_${example} COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:f03_ex_${example}>"
-          -D "TEST_ARGS:STRING="
-          -D "TEST_EXPECT=0"
-          -D "TEST_SKIP_COMPARE=TRUE"
-          -D "TEST_OUTPUT=f03_ex_${example}.txt"
-          #-D "TEST_REFERENCE=f03_ex_${example}.out"
-          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-    endif ()
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "f03_ex_${example}")
-    if (BUILD_SHARED_LIBS)
-      if (HDF5_ENABLE_USING_MEMCHECKER)
-        add_test (NAME f03_ex-shared_${example} COMMAND $<TARGET_FILE:f03_ex_${example}-shared>)
-      else ()
-        add_test (NAME f03_ex-shared_${example} COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=$<TARGET_FILE:f03_ex_${example}-shared>"
-            -D "TEST_ARGS:STRING="
-            -D "TEST_EXPECT=0"
-            -D "TEST_SKIP_COMPARE=TRUE"
-            -D "TEST_OUTPUT=f03_ex_${example}-shared.txt"
-            #-D "TEST_REFERENCE=f03_ex_${example}-shared.out"
-            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-            -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-        )
-      endif ()
-      if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (f03_ex-shared_${example} PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "f03_ex-shared_${example}")
-    endif ()
-  endforeach ()
-endif ()
+foreach (example ${F2003_examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME f03_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f03_ex_${example}>)
+  else ()
+    add_test (NAME f03_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:f03_ex_${example}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=f03_ex_${example}.txt"
+        #-D "TEST_REFERENCE=f03_ex_${example}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (f03_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
+  if (last_test)
+    set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
+  endif ()
+  set (last_test "f03_ex_${example}")
+endforeach ()
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
-  add_test (NAME f90_ex_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS})
-  if (BUILD_SHARED_LIBS)
-    add_test (NAME f90_ex-shared_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS})
-  endif ()
+  add_test (NAME MPI_TEST_f90_ex_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS})
 endif ()