Merge pull request #1489 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'e6be5560882c2f598b3a0ddab7d9d29a552fcb10':
  MPI vars need passed in, change to grepTest

4 files changed, 11 insertions, 339 deletions

diff --git a/MANIFEST b/MANIFEST
index 5ff8ce1..f54560a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3243,7 +3243,6 @@
 ./config/cmake_ext_mod/NSIS.InstallOptions.ini.in
 ./config/cmake_ext_mod/NSIS.template.in
 ./config/cmake_ext_mod/runTest.cmake
-./config/cmake_ext_mod/parrunTest.cmake
 ./config/cmake_ext_mod/version.plist.in
 
 # CMake-specific User Files
diff --git a/config/cmake_ext_mod/parrunTest.cmake b/config/cmake_ext_mod/parrunTest.cmake
deleted file mode 100644
index 8449448..0000000
--- a/config/cmake_ext_mod/parrunTest.cmake
+++ /dev/null
@@ -1,325 +0,0 @@
-#
-# 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.
-#
-# parrunTest.cmake executes a command using MPI and captures the output in a file. File is then compared
-# against a reference file. Exit status of command can also be compared.
-cmake_policy(SET CMP0007 NEW)
-
-# arguments checking
-if (NOT TEST_PROGRAM)
-  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
-endif ()
-if (NOT TEST_FOLDER)
-  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-endif ()
-if (NOT TEST_OUTPUT)
-  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
-endif ()
-if (NOT TEST_EXPECT)
-  message (STATUS "Require TEST_EXPECT to be defined")
-endif ()
-
-if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
-  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
-endif ()
-
-if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
-  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
-endif ()
-
-message (STATUS "COMMAND: ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ${TEST_PROGRAM} ${MPIEXEC_POSTFLAGS} ${TEST_ARGS}")
-
-if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 AND NOT MINGW)
-    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
-  else ()
-    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
-  endif ()
-endif ()
-
-if (TEST_ENV_VAR)
-  set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
-  #message (STATUS "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
-endif ()
-
-if (NOT TEST_INPUT)
-  # run the test program, capture the stdout/stderr and the result var
-  execute_process (
-      COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ${TEST_PROGRAM} ${MPIEXEC_POSTFLAGS} ${TEST_ARGS}
-      WORKING_DIRECTORY ${TEST_FOLDER}
-      RESULT_VARIABLE TEST_RESULT
-      OUTPUT_FILE ${TEST_OUTPUT}
-      ERROR_FILE ${TEST_OUTPUT}.err
-      OUTPUT_VARIABLE TEST_OUT
-      ERROR_VARIABLE TEST_ERROR
-  )
-else ()
-  # run the test program with stdin, capture the stdout/stderr and the result var
-  execute_process (
-      COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ${TEST_PROGRAM} ${MPIEXEC_POSTFLAGS} ${TEST_ARGS}
-      WORKING_DIRECTORY ${TEST_FOLDER}
-      RESULT_VARIABLE TEST_RESULT
-      INPUT_FILE ${TEST_INPUT}
-      OUTPUT_FILE ${TEST_OUTPUT}
-      ERROR_FILE ${TEST_OUTPUT}.err
-      OUTPUT_VARIABLE TEST_OUT
-      ERROR_VARIABLE TEST_ERROR
-  )
-endif ()
-
-if (TEST_REGEX)
-  # TEST_REGEX should always be matched
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  string (REGEX MATCH "${TEST_REGEX}" REGEX_MATCH ${TEST_STREAM})
-  string (COMPARE EQUAL "${REGEX_MATCH}" "${TEST_MATCH}" REGEX_RESULT)
-  if (NOT REGEX_RESULT)
-    message (STATUS "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_MATCH}")
-  endif ()
-endif ()
-
-message (STATUS "COMMAND Result: ${TEST_RESULT}")
-
-# if the .err file exists and ERRROR_APPEND is enabled
-if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  if (TEST_MASK_FILE)
-    STRING(REGEX REPLACE "CurrentDir is [^\n]+\n" "CurrentDir is (dir name)\n" TEST_STREAM "${TEST_STREAM}")
-  endif ()
-  # remove special output
-  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
-
-  if (NOT ERROR_APPEND)
-    # write back to original .err file
-    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
-  else ()
-    # append error output to the stdout output file
-    file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-  endif ()
-endif ()
-
-# append the test result status with a predefined text
-if (TEST_APPEND)
-  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_RESULT}\n")
-endif ()
-
-# if the return value is !=${TEST_EXPECT} bail out
-if (NOT TEST_RESULT EQUAL TEST_EXPECT)
-  if (NOT TEST_NOERRDISPLAY)
-    if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
-      file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-      message (STATUS "Output :\n${TEST_STREAM}")
-    endif ()
-  endif ()
-  message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
-endif ()
-
-message (STATUS "COMMAND Error: ${TEST_ERROR}")
-
-# remove special output
-file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-string (FIND TEST_STREAM "_pmi_alps" "${TEST_FIND_RESULT}")
-if (TEST_FIND_RESULT GREATER 0)
-  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
-  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
-endif ()
-
-# if the output file needs Storage text removed
-if (TEST_MASK)
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  string (REGEX REPLACE "Storage:[^\n]+\n" "Storage:   <details removed for portability>\n" TEST_STREAM "${TEST_STREAM}")
-  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-endif ()
-
-# if the output file needs Modified text removed
-if (TEST_MASK_MOD)
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-   string (REGEX REPLACE "Modified:[^\n]+\n" "Modified:  XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}")
-  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-endif ()
-
-# if the output file or the .err file needs to mask out error stack info
-if (TEST_MASK_ERROR)
-  if (NOT TEST_ERRREF)
-    # the error stack has been appended to the output file
-    file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  else ()
-    # the error stack remains in the .err file
-    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  endif ()
-  string (REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE " line [0-9]*" " line (number)" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "v[1-9]*[.][0-9]*[.]" "version (number)." TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "[1-9]*[.][0-9]*[.][0-9]*[^)]*" "version (number)" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
-  string (REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
-  # write back the changes to the original files
-  if (NOT TEST_ERRREF)
-    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-  else ()
-    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
-  endif ()
-endif ()
-
-# remove text from the output file
-if (TEST_FILTER)
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  string (REGEX REPLACE "${TEST_FILTER}" "${TEST_FILTER_REPLACE}" TEST_STREAM "${TEST_STREAM}")
-  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-endif ()
-
-if (TEST_REF_FILTER)
-  #message (STATUS "TEST_REF_FILTER: ${TEST_APPEND}${TEST_REF_FILTER}")
-  file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-  STRING(REGEX REPLACE "${TEST_REF_APPEND}" "${TEST_REF_FILTER}" TEST_STREAM "${TEST_STREAM}")
-  file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-endif ()
-
-# compare output files to references unless this must be skipped
-if (NOT TEST_SKIP_COMPARE)
-  if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
-    if (WIN32 AND NOT MINGW)
-      file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-      file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-    endif ()
-
-    if (NOT TEST_SORT_COMPARE)
-      # now compare the output with the reference
-      execute_process (
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
-          RESULT_VARIABLE TEST_RESULT
-      )
-    else ()
-      file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
-      file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
-      list (SORT v1)
-      list (SORT v2)
-      if (NOT v1 STREQUAL v2)
-        set(TEST_RESULT 1)
-      endif ()
-    endif ()
-
-    if (TEST_RESULT)
-      set (TEST_RESULT 0)
-      file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
-      list (LENGTH test_act len_act)
-      file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
-      list (LENGTH test_ref len_ref)
-      if (len_act GREATER 0 AND len_ref GREATER 0)
-        math (EXPR _FP_LEN "${len_ref} - 1")
-        foreach (line RANGE 0 ${_FP_LEN})
-          list (GET test_act ${line} str_act)
-          list (GET test_ref ${line} str_ref)
-          if (NOT ${str_act} STREQUAL ${str_ref})
-            if (NOT str_act STREQUAL "")
-              set (TEST_RESULT 1)
-              message ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-            endif ()
-          endif ()
-        endforeach ()
-      else ()
-        if (len_act EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
-        endif ()
-        if (len_ref EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
-        endif ()
-      endif ()
-      if (NOT len_act EQUAL len_ref)
-        set (TEST_RESULT 1)
-      endif ()
-    endif ()
-
-    message (STATUS "COMPARE Result: ${TEST_RESULT}")
-
-    # again, if return value is !=0 scream and shout
-    if (TEST_RESULT)
-      message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
-    endif ()
-  endif ()
-
-  # now compare the .err file with the error reference, if supplied
-  if (TEST_ERRREF)
-    if (WIN32 AND NOT MINGW)
-      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
-    endif ()
-
-    # now compare the error output with the error reference
-    execute_process (
-        COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
-        RESULT_VARIABLE TEST_RESULT
-    )
-    if (TEST_RESULT)
-      set (TEST_RESULT 0)
-      file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
-      list (LENGTH test_act len_act)
-      file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
-      list (LENGTH test_ref len_ref)
-      math (EXPR _FP_LEN "${len_ref} - 1")
-      if (len_act GREATER 0 AND len_ref GREATER 0)
-        math (EXPR _FP_LEN "${len_ref} - 1")
-        foreach (line RANGE 0 ${_FP_LEN})
-          list (GET test_act ${line} str_act)
-          list (GET test_ref ${line} str_ref)
-          if (NOT ${str_act} STREQUAL ${str_ref})
-            if (NOT ${str_act} STREQUAL "")
-              set (TEST_RESULT 1)
-              message ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-            endif ()
-          endif ()
-        endforeach ()
-      else ()
-        if (len_act EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT}.err is empty")
-        endif ()
-        if (len_ref EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_ERRREF} is empty")
-        endif ()
-      endif ()
-      if (NOT len_act EQUAL len_ref)
-        set (TEST_RESULT 1)
-      endif ()
-    endif ()
-
-    message (STATUS "COMPARE Result: ${TEST_RESULT}")
-
-    # again, if return value is !=0 scream and shout
-    if (TEST_RESULT)
-      message (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
-    endif ()
-  endif ()
-endif ()
-
-if (TEST_GREP_COMPARE)
-  # now grep the output with the reference
-  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-
-  # TEST_REFERENCE should always be matched
-  string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
-  string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_RESULT)
-  if (NOT TEST_RESULT)
-    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
-  endif ()
-
-  string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
-  if (TEST_EXPECT)
-    # TEST_EXPECT (1) interperts TEST_FILTER as NOT to match
-    string (LENGTH "${TEST_MATCH}" TEST_RESULT)
-    if (TEST_RESULT)
-      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
-    endif ()
-  endif ()
-endif ()
-
-# everything went fine...
-message ("${TEST_PROGRAM} Passed")
-
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index e11852a..48402a2 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -312,7 +312,7 @@ if (TEST_GREP_COMPARE)
 
   string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
   if (TEST_EXPECT)
-    # TEST_EXPECT (1) interperts TEST_FILTER as NOT to match
+    # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
     string (LENGTH "${TEST_MATCH}" TEST_RESULT)
     if (TEST_RESULT)
       message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index 26babbb..dd1e03b 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -184,15 +184,14 @@
       add_test (NAME EXAMPLES_PAR-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
     else ()
       add_test (NAME EXAMPLES_PAR-ph5example COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:ph5example>"
+          -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_SORT_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}/parrunTest.cmake"
+          -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
     endif ()
     if (NOT "${last_test}" STREQUAL "")
@@ -204,15 +203,14 @@
         add_test (NAME EXAMPLES_PAR-shared-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example-shared> ${MPIEXEC_POSTFLAGS})
       else ()
         add_test (NAME EXAMPLES_PAR-shared-ph5example COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=$<TARGET_FILE:ph5example-shared>"
+            -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_SORT_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}/parrunTest.cmake"
+            -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
         )
       endif ()
       set_tests_properties (EXAMPLES_PAR-shared-ph5example PROPERTIES WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/H5EX-shared)