Skip to content

Portably escape pipe characters in diff --ignore-matching-lines regexes #111171

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

Closed
wants to merge 2 commits into from
Closed

Portably escape pipe characters in diff --ignore-matching-lines regexes #111171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d5500
Portably escape pipe characters in `diff --ignore-matching-lines` reg…
Zalathar May 4, 2023
379d96b
Update snapshot `expected_show_coverage.async.txt`
Zalathar May 4, 2023
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
8 changes: 7 additions & 1 deletion tests/run-make/coverage-reports/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,13 @@ else
# files are redundant, so there is no need to generate `expected_*.json` files or
# compare actual JSON results.)

$(DIFF) --ignore-matching-lines='^ \| .*::<.*>.*:$$' --ignore-matching-lines='^ \| <.*>::.*:$$' \
# CAUTION: GNU diff and Apple/FreeBSD diff use slightly different regex dialects.
# GNU diff treats `|` as a literal pipe character, and `\|` as a regex OR operator.
# Apple/FreeBSD diff treats `|` as a regex OR operator, and `|` as a literal pipe.
# To match a literal pipe character in both implementations, we need to wrap it in
# a character class `[|]` instead. Nobody is happy about this.

$(DIFF) --ignore-matching-lines='^ [|] .*::<.*>.*:$$' --ignore-matching-lines='^ [|] <.*>::.*:$$' \
expected_show_coverage.$@.txt "$(TMPDIR)"/actual_show_coverage.$@.txt || \
( grep -q '^\/\/ ignore-llvm-cov-show-diffs' $(SOURCEDIR)/$@.rs && \
>&2 echo 'diff failed, but suppressed with `// ignore-llvm-cov-show-diffs` in $(SOURCEDIR)/$@.rs' \
Expand Down
4 changes: 2 additions & 2 deletions tests/run-make/coverage-reports/expected_show_coverage.async.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
41| 1| // executed asynchronously.
42| 1| match x {
43| 1| y if c(x).await == y + 1 => { d().await; }
^0 ^0 ^0 ^0
^0 ^0 ^0 ^0
44| 1| y if f().await == y + 1 => (),
^0 ^0 ^0
^0 ^0 ^0
45| 1| _ => (),
46| | }
47| 1|}
Expand Down