CI fix a bug in run-tests.sh (#1159)

hsutter · Jul 12, 2024 · b8dd70f · b8dd70f
1 parent a252d50
commit b8dd70f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/regression-tests/run-tests.sh b/regression-tests/run-tests.sh
@@ -28,7 +28,9 @@ report_diff () {
     if [[ -n "$diff_output" ]]; then
         echo "            $error_msg:"
         echo "                $file"
-        printf "\n$diff_output\n\n" | tee -a "$patch_file"
+        # $diff_output cannot be put directly in the format string
+        # Otherwise \ might be interpreted as an escape character
+        printf "\n%s\n\n" "$diff_output" | tee -a "$patch_file"
         failure=1
     fi
 }
@@ -70,8 +72,7 @@ check_file () {
         report_diff "$file" \
             "Non-matching $description" \
             "$patch_file" \
-            --ignore-cr-at-eol \
-            --ignore-matching-lines="C:\\\\"
+            --ignore-cr-at-eol
     fi
 }
 

diff --git a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-expected-not-null.cpp.output b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-expected-not-null.cpp.output
@@ -14,7 +14,7 @@ pure2-assert-expected-not-null.cpp2(14): error C2143: syntax error: missing ';'
 pure2-assert-expected-not-null.cpp2(14): error C2039: 'unexpected': is not a member of 'std'
 predefined C++ types (compiler internal)(347): note: see declaration of 'std'
 pure2-assert-expected-not-null.cpp2(14): error C2660: 'unexpected': function does not take 1 arguments
-C:\Program Files\Microsoft Visual Studio�2nterprise\VC\Tools\MSVC.40.33807\includeh.h(33): note: see declaration of 'unexpected'
+C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.40.33807\include\eh.h(33): note: see declaration of 'unexpected'
 pure2-assert-expected-not-null.cpp2(14): note: while trying to match the argument list '(bool)'
 pure2-assert-expected-not-null.cpp2(14): error C2143: syntax error: missing ';' before '}'
 pure2-assert-expected-not-null.cpp2(15): error C2065: 'ex': undeclared identifier