Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 138 insertions, 114 deletions

diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index 6f633f3..b373fe4 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -5,7 +5,7 @@
 # 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.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -38,7 +38,7 @@ endif ()
 message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
 
 if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 OR MINGW)
+  if (WIN32)
     set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
   else ()
     set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -90,18 +90,21 @@ 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}")
+  list (LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    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}")
+    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 ()
 endif ()
 
@@ -125,7 +128,7 @@ 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)
+string (FIND TEST_STREAM "_pmi_alps" TEST_FIND_RESULT)
 if (TEST_FIND_RESULT GREATER -1)
   string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
   file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
@@ -139,7 +142,7 @@ else ()
   # the error stack remains in the .err file
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
 endif ()
-string (FIND "${TEST_STREAM}" "no version information available" TEST_FIND_RESULT)
+string (FIND TEST_STREAM "no version information available" TEST_FIND_RESULT)
 if (TEST_FIND_RESULT GREATER -1)
   string (REGEX REPLACE "^.*no version information available[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
   # write back the changes to the original files
@@ -160,7 +163,7 @@ 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}")
+  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 ()
 
@@ -198,147 +201,168 @@ 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}")
+  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
+set (TEST_COMPARE_RESULT 0)
 if (NOT TEST_SKIP_COMPARE)
   if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
-    if (WIN32 OR MINGW)
-      configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-      file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
-      #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-      #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-    endif ()
+    file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    list (LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+      if (WIN32)
+        configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+        if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+          file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+        endif ()
+        #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)
+      if (NOT TEST_SORT_COMPARE)
+        # now compare the output with the reference
+        execute_process (
+            COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+            RESULT_VARIABLE TEST_COMPARE_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_COMPARE_RESULT 1)
+        endif ()
       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 (str_act)
-              set (TEST_RESULT 1)
-              message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+      if (TEST_COMPARE_RESULT)
+        set (TEST_COMPARE_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 (NOT len_act EQUAL len_ref)
+          set (TEST_COMPARE_RESULT 1)
+        endif ()
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          if (TEST_SORT_COMPARE)
+            list (SORT test_act)
+            list (SORT test_ref)
+          endif ()
+          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 (str_act)
+                set (TEST_COMPARE_RESULT 1)
+                message (STATUS "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 ()
-        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}")
+    message (STATUS "COMPARE Result: ${TEST_COMPARE_RESULT}")
 
     # again, if return value is !=0 scream and shout
-    if (TEST_RESULT)
+    if (TEST_COMPARE_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
+  set (TEST_ERRREF_RESULT 0)
   if (TEST_ERRREF)
-    if (WIN32 OR MINGW)
-      configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
-      file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
-      #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
-    endif ()
+    file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+    list (LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+      if (WIN32)
+        configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
+        if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
+          file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+        endif ()
+        #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)
+      # now compare the error output with the error reference
+      execute_process (
+          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
+          RESULT_VARIABLE TEST_ERRREF_RESULT
+      )
+      if (TEST_ERRREF_RESULT)
+        set (TEST_ERRREF_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")
-        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 (str_act)
-              set (TEST_RESULT 1)
-              message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+        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 (str_act)
+                set (TEST_ERRREF_RESULT 1)
+                message (STATUS "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 ()
-        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")
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_ERRREF_RESULT 1)
         endif ()
       endif ()
-      if (NOT len_act EQUAL len_ref)
-        set (TEST_RESULT 1)
-      endif ()
     endif ()
 
-    message (STATUS "COMPARE Result: ${TEST_RESULT}")
+    message (STATUS "COMPARE Result: ${TEST_ERRREF_RESULT}")
 
     # again, if return value is !=0 scream and shout
-    if (TEST_RESULT)
+    if (TEST_ERRREF_RESULT)
       message (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
     endif ()
   endif ()
 endif ()
 
+set (TEST_GREP_RESULT 0)
 if (TEST_GREP_COMPARE)
   # now grep the output with the reference
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  list (LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    # TEST_REFERENCE should always be matched
+    string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
+    string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
+    if (NOT TEST_GREP_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+    endif ()
 
-  # 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) 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}")
+    string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
+    if (TEST_EXPECT)
+      # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
+      string (LENGTH "${TEST_MATCH}" TEST_GREP_RESULT)
+      if (TEST_GREP_RESULT)
+        message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+      endif ()
     endif ()
   endif ()
 endif ()