Separate result variables for the function performed

1 files changed, 22 insertions, 19 deletions

diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index 56e7add..885e4f7 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -206,6 +206,7 @@ if (TEST_REF_FILTER)
 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}")
     file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
@@ -224,7 +225,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)
@@ -232,12 +233,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)
@@ -249,7 +250,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 ()
@@ -263,20 +264,21 @@ 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)
     file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
     list(LENGTH TEST_STREAM test_len)
@@ -293,10 +295,10 @@ if (NOT TEST_SKIP_COMPARE)
       # 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
+          RESULT_VARIABLE TEST_ERRREF_RESULT
       )
-      if (TEST_RESULT)
-        set (TEST_RESULT 0)
+      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)
@@ -309,7 +311,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_ERRREF_RESULT 1)
                 message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
               endif ()
             endif ()
@@ -323,20 +325,21 @@ if (NOT TEST_SKIP_COMPARE)
           endif ()
         endif ()
         if (NOT len_act EQUAL len_ref)
-          set (TEST_RESULT 1)
+          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)
@@ -344,16 +347,16 @@ 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 ()