Separate result variables for the function performed

1 files changed, 17 insertions, 14 deletions

diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake
index ead22a7..c65c951 100644
--- a/config/cmake_ext_mod/grepTest.cmake
+++ b/config/cmake_ext_mod/grepTest.cmake
@@ -82,6 +82,7 @@ if (TEST_FIND_RESULT GREATER 0)
 endif ()
 
 # if the TEST_ERRREF exists grep the error output with the error reference
+set (TEST_ERRREF_RESULT 0)
 if (TEST_ERRREF)
   # if the .err file exists grep the error output with the error reference before comparing stdout
   if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
@@ -90,14 +91,15 @@ if (TEST_ERRREF)
     if (test_len GREATER 0)
       # TEST_ERRREF should always be matched
       string (REGEX MATCH "${TEST_ERRREF}" TEST_MATCH ${TEST_ERR_STREAM})
-      string (COMPARE EQUAL "${TEST_ERRREF}" "${TEST_MATCH}" TEST_RESULT)
-      if (NOT TEST_RESULT)
+      string (COMPARE EQUAL "${TEST_ERRREF}" "${TEST_MATCH}" TEST_ERRREF_RESULT)
+      if (NOT TEST_ERRREF_RESULT)
         message (FATAL_ERROR "Failed: The error output of ${TEST_PROGRAM} did not contain ${TEST_ERRREF}")
       endif ()
     endif ()
   endif ()
 
   #always compare output file to reference 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)
@@ -115,7 +117,7 @@ if (TEST_ERRREF)
           # 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)
@@ -123,12 +125,12 @@ if (TEST_ERRREF)
           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)
@@ -140,7 +142,7 @@ if (TEST_ERRREF)
               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 ()
@@ -154,27 +156,28 @@ if (TEST_ERRREF)
             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 ()
   endif ()
 else ()
   # else grep the output with the reference
+  set (TEST_GREP_RESULT 0)
   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)
+  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 ()
 endif ()
@@ -184,8 +187,8 @@ if (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_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 ()