Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI Fix a bug in run-tests.sh #1159

Merged
merged 1 commit into from
Jul 12, 2024
Merged

CI Fix a bug in run-tests.sh #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions regression-tests/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion regression-tests/test-results/msvc-2022-c++20/pure2-assert-expected-not-null.cpp.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading