Separate result variables for the function performed

1 files changed, 65 insertions, 55 deletions

diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index d53860c..0315536 100644
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@@ -125,6 +125,7 @@ endif ()
 message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
 # 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}")
     file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
@@ -143,7 +144,7 @@ if (NOT TEST_SKIP_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
+            RESULT_VARIABLE TEST_COMPARE_RESULT
         )
       else ()
         file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
@@ -151,12 +152,12 @@ if (NOT TEST_SKIP_COMPARE)
         list (SORT v1)
         list (SORT v2)
         if (NOT v1 STREQUAL v2)
-          set(TEST_RESULT 1)
+          set(TEST_COMPARE_RESULT 1)
         endif ()
       endif ()
 
-      if (TEST_RESULT)
-        set (TEST_RESULT 0)
+      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)
@@ -168,7 +169,7 @@ if (NOT TEST_SKIP_COMPARE)
             list (GET test_ref ${line} str_ref)
             if (NOT str_act STREQUAL str_ref)
               if (str_act)
-                set (TEST_RESULT 1)
+                set (TEST_COMPARE_RESULT 1)
                 message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
               endif ()
             endif ()
@@ -182,82 +183,82 @@ if (NOT TEST_SKIP_COMPARE)
           endif ()
         endif ()
         if (NOT len_act EQUAL len_ref)
-          set (TEST_RESULT 1)
+          set (TEST_COMPARE_RESULT 1)
         endif ()
       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 (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}")
-      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      list(LENGTH TEST_STREAM test_len)
-      if (test_len GREATER 0)
-        if (WIN32 OR MINGW)
-          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}")
+    file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+    list(LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+      if (WIN32 OR MINGW)
+        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)
+      # 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_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")
+        if (len_act GREATER 0 AND len_ref GREATER 0)
           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 (str_act)
-                  set (TEST_RESULT 1)
-                  message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-                endif ()
+          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 ()
-            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 (NOT len_act EQUAL len_ref)
-            set (TEST_RESULT 1)
+          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_ERRREF_RESULT 1)
+        endif ()
       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)
@@ -265,22 +266,31 @@ if (TEST_GREP_COMPARE)
   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_RESULT)
-    if (NOT TEST_RESULT)
+    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 ()
 
     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)
+      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 ()
 
+# dump the output unless nodisplay option is set
+if (TEST_SKIP_COMPARE AND NOT TEST_NO_DISPLAY)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  execute_process (
+      COMMAND ${CMAKE_COMMAND} -E echo ${TEST_STREAM}
+      RESULT_VARIABLE TEST_RESULT
+  )
+endif ()
+
 # everything went fine...
 message (STATUS "${TEST_PROGRAM} Passed")