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

* commit '6819c11508b0610f222fe3bfe8a19f637bf4319c': (154 commits)
  CMake needs a tar.gz examples file for windows, too.
  Correct file permissions on README.txt.
  Address merge anomalies and incorrect file permissions.
  Update release date in README.txt and RELEASE.txt.
  Revisions to Platforms tested.
  Updated LT_VERS_AGE in config/lt_vers.am due to reinstatement of previously removed symbols, then ran autogen.sh to propagate so number changes and H5E_LOGFAIL_g addition to files checked in on release branch.
  Updated H5err.txt to replace a global variable that was removed during the metadata cache logging changes (to maintain binary compatibility).
  HDFFV-10552,10686 restore H5O_*1 functions
  Minor fix in h5str_sprintf for NULL region references
  Add new files to MANIFEST.
  Update so version numbers. fix 2 typos.
  Update RELEASE.txt for TRILABS-34 and remove unused sections.
  Add script for building HDF5 with CMake on HPC machines that use sbatch. Add README file for inclusion in CMake-hdf5-<version>.tar.gz file. Add updated README_HPC file with cross compile instructions.
  set version to 1.10.5-pre1. Change default build mode to production.
  Merge pull request #1560 in HDFFV/hdf5 from hdf5-1-10-documentation-only to hdf5_1_10_5
  Update HISTORY-1_10.txt and RELEASE.txt files.
  Modify RELEASE.txt in response to PR comments
  Check in files generated by autogen.sh for hdf5_1_10_5 release branch.
  Check in files generated by autogen.sh for hdf5_1_10_5 release branch. 2019/02/16.
  Code improvement
  ...

2 files changed, 21 insertions, 21 deletions

diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index dd4766a..cb47c78 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -181,42 +181,42 @@
 ### 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 EXAMPLES-ph5example COMMAND $<TARGET_FILE:ph5example>)
+      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 EXAMPLES-ph5example COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:ph5example>"
+      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_SKIP_COMPARE=TRUE"
-          -D "TEST_OUTPUT=ph5example.txt"
-          #-D "TEST_REFERENCE=ph5example.out"
+          -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}/runTest.cmake"
+          -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
     endif ()
     if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test})
+      set_tests_properties (MPI_TEST_EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test})
     endif ()
-    set (last_test "EXAMPLES-ph5example")
+    set (last_test "MPI_TEST_EXAMPLES-ph5example")
     if (BUILD_SHARED_LIBS)
       if (HDF5_ENABLE_USING_MEMCHECKER)
-        add_test (NAME EXAMPLES-shared-ph5example COMMAND $<TARGET_FILE:ph5example-shared>)
+        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 EXAMPLES-shared-ph5example COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=$<TARGET_FILE:ph5example-shared>"
+        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_SKIP_COMPARE=TRUE"
-            -D "TEST_OUTPUT=ph5example-shared.txt"
-            #-D "TEST_REFERENCE=ph5example-shared.out"
+            -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}/runTest.cmake"
+            -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
         )
       endif ()
-      set_tests_properties (EXAMPLES-shared-ph5example PROPERTIES WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/H5EX-shared)
+      set_tests_properties (MPI_TEST_EXAMPLES-shared-ph5example PROPERTIES WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/H5EX-shared)
       if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (EXAMPLES-shared-ph5example PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (MPI_TEST_EXAMPLES-shared-ph5example PROPERTIES DEPENDS ${last_test})
       endif ()
-      set (last_test "EXAMPLES-shared-ph5example")
+      set (last_test "MPI_TEST_EXAMPLES-shared-ph5example")
     endif ()
   endif ()
diff --git a/examples/Makefile.in b/examples/Makefile.in
index bf484e2..4f5b84d 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -501,7 +501,6 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MEMORYALLOCSANITYCHECK = @MEMORYALLOCSANITYCHECK@
-METADATATRACEFILE = @METADATATRACEFILE@
 MKDIR_P = @MKDIR_P@
 MPE = @MPE@
 NM = @NM@
@@ -535,6 +534,7 @@ PAC_FORTRAN_NUM_INTEGER_KINDS = @PAC_FORTRAN_NUM_INTEGER_KINDS@
 PARALLEL = @PARALLEL@
 PARALLEL_FILTERED_WRITES = @PARALLEL_FILTERED_WRITES@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PREADWRITE = @PREADWRITE@
 PROFILING = @PROFILING@
 RANLIB = @RANLIB@
 ROOT = @ROOT@
@@ -1438,7 +1438,7 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
 	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "Set HDF5_PARAPREFIX to use another directory. e.g.,";       \
 	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
 	    echo "    export HDF5_PARAPREFIX";                                \
 	    echo "    make check";                                            \