Merge pull request #886 from pbalcer/better-match-out

[test] improve match file error output

Author: pbalcer

cmake/match.cmake

@@ -71,9 +71,7 @@ execute_process(
 )
 
 if(TEST_RESULT)
-    file(READ ${OUT_FILE} OUTPUT)
-    file(READ ${MATCH_FILE} MATCH_STRING)
-    message(FATAL_ERROR "Failed: The output of ${OUT_FILE}:\n  ${OUTPUT}\n does not match ${MATCH_FILE}:\n ${MATCH_STRING} (${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()

cmake/match.py

@@ -60,6 +60,11 @@
             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)
             sys.exit(1)
     else:
         if (input_idx == len(input_lines) - 1):