Merge pull request #2203 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/masterhdf5-1_10_6

* commit 'e0fa36bfe008c03365ce8ea94d705f8fdebccdf0': (166 commits)
  Update release date strings in README.txt and release_docs/RELEASE.txt
  Add release note about using ompio instead of romio when collective writes fail with OpenMPI.
  Fixed typos, grammatical errors, etc. Expanded entry for S3 and HDFS VFDs. Moved Mac 10.11 and 10.12 from Supported Platforms to More Platforms Tested.
  Add qualification to RELEASE.txt regarding performance improvements
  Standalone doesn't use h5test implementation.
  Add missing note
  Update COPYING file with new HDF5 license.
  Update bin/config.guess and config.sub to current version available from git.savannah.gnu.org.
  Fix include to correct memory calls - big-endian issue.
  Revert BLDLIBDIR value in junit.sh.in.
  Corrections to CMake functions
  Update version for HDF5 1.10.6 release. Remove autom4te.cache directory that shouldn't have been added.
  Remove duplicate instance
  Fix merge issue
  HDFFV-10979 - fix global name clash
  Correct clang search and java include
  Latest date first in RELEASE.txt
  Update RELEASE.txt with performance improvements and Steven Varga's bugfix.
  Update version numbers for shared lib files according to api compatibility report.
  Created hdf5_1_10_6 branch for HDF5 1.10.6 release preparation. Set version to 1.10.6-pre1. Switched default  maintainer mode to disabled and default build mode to production. Added files produced by autogen.sh to commit except for src/H5config.h.in~ and src/H5public.h~.
  ...

1 files changed, 92 insertions, 197 deletions

diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index cb47c78..ea3b2c5 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -15,208 +15,103 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-  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 ()
+file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w)
 
-  # 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 (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (EXAMPLES-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "EXAMPLES-clear-objects")
+set (test_ex_CLEANFILES
+    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
+)
 
-  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 (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "EXAMPLES-${example}")
-  endforeach ()
+# Remove any output file left over from previous test run
+add_test (
+    NAME EXAMPLES-clear-objects
+    COMMAND    ${CMAKE_COMMAND} -E remove ${test_ex_CLEANFILES}
+)
+set_tests_properties (EXAMPLES-clear-objects PROPERTIES FIXTURES_SETUP clear_EXAMPLES)
 
-  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
-            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
-            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
-            blue/prefix_target.h5
-            red/prefix_target.h5
-            u2w/u2w_target.h5
-        WORKING_DIRECTORY
-            ${PROJECT_BINARY_DIR}/H5EX-shared
+foreach (example ${examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME EXAMPLES-${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${example}>)
+  else ()
+    add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -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"
     )
-    if (NOT "${last_test}" STREQUAL "")
-      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 (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (EXAMPLES-shared-${example} PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "EXAMPLES-shared-${example}")
-    endforeach ()
   endif ()
+  set_tests_properties (EXAMPLES-${example} PROPERTIES FIXTURES_REQUIRED clear_EXAMPLES)
+  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)
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
-    else ()
-      add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
-          -D "TEST_ARGS:STRING="
-          -D "TEST_EXPECT=0"
-          -D "TEST_OUTPUT=ph5example.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}"
-          -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
-      )
-    endif ()
-    if (NOT "${last_test}" STREQUAL "")
-      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 (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (MPI_TEST_EXAMPLES-shared-ph5example PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "MPI_TEST_EXAMPLES-shared-ph5example")
-    endif ()
+if (H5_HAVE_PARALLEL AND NOT WIN32)
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
+  else ()
+    add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_OUTPUT=ph5example.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}"
+        -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
+    )
+  endif ()
+  if (last_test)
+    set_tests_properties (MPI_TEST_EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test})
   endif ()
+  set (last_test "MPI_TEST_EXAMPLES-ph5example")
+endif ()