Merge pull request #904 from lukaszstolarczuk/fix-match.py

[UR][Tests] Update match scripts

Author: pbalcer

cmake/match.cmake

@@ -61,7 +61,7 @@ elseif(${MODE} STREQUAL "file")
 endif()
 
 if(TEST_RESULT)
-    message(FATAL_ERROR "Failed: Test ${TEST_FILE} ${TEST_ARGS} returned non-zero (${TEST_RESULT}).")
+    message(FATAL_ERROR "Failed: Test command '${TEST_FILE} ${TEST_ARGS}' returned non-zero (${TEST_RESULT}).")
 endif()
 
 # Compare the output file contents with a match file contents
@@ -71,11 +71,7 @@ execute_process(
 )
 
 if(TEST_RESULT)
-    message(FATAL_ERROR "Failed (${TEST_RESULT}): The output of ${OUT_FILE} does not match ${MATCH_FILE}")
-elseif()
-    message("Passed: The output ${OUT_FILE} matches ${MATCH_FILE}")
-endif()
-
-if(EXISTS ${OUT_FILE})
-    file(REMOVE ${OUT_FILE})
+    message(FATAL_ERROR "Failed (${TEST_RESULT}): The output of test command '${TEST_FILE} ${TEST_ARGS}' (stored in ${CMAKE_CURRENT_BINARY_DIR}/${OUT_FILE}) does not match '${MATCH_FILE}'")
+else()
+    message("Passed: The output of test command '${TEST_FILE} ${TEST_ARGS}' (stored in ${CMAKE_CURRENT_BINARY_DIR}/${OUT_FILE}) matches '${MATCH_FILE}'")
 endif()

cmake/match.py

@@ -11,6 +11,16 @@
 import sys
 import re
 
+
+## @brief print the whole content of input and match files
+def print_content(input_lines, match_lines):
+    print("--- Input Lines " + "-" * 64)
+    print("".join(input_lines).strip())
+    print("--- Match Lines " + "-" * 64)
+    print("".join(match_lines).strip())
+    print("-" * 80)
+
+
 if len(sys.argv) != 3:
     print("Usage: python match.py <input_file> <match_file>")
     sys.exit(1)
@@ -23,7 +33,9 @@
     match_lines = match.readlines()
 
 if len(match_lines) < len(input_lines):
-    sys.exit(f"Match length < input length (input: {len(input_lines)}, match: {len(match_lines)})")
+    print(f"Match length < input length (input: {len(input_lines)}, match: {len(match_lines)})")
+    print_content(input_lines, match_lines)
+    sys.exit(1)
 
 input_idx = 0
 opt = "{{OPT}}"
@@ -60,11 +72,7 @@
             print("Line " + str(i+1) + " does not match")
             print("is:       " + input_line)
             print("expected: " + match_line.strip())
-            print("--- Input Lines " + "-" * 64)
-            print("".join(input_lines).strip())
-            print("--- Match Lines " + "-" * 64)
-            print("".join(match_lines).strip())
-            print("-" * 80)
+            print_content(input_lines, match_lines)
             sys.exit(1)
     else:
         if (input_idx == len(input_lines) - 1):