diff options
| author | bors <bors@rust-lang.org> | 2023-04-30 10:36:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-30 10:36:06 +0000 |
| commit | 89158e210ce0b9550b42c65ede244087f2e144b5 (patch) | |
| tree | dde9068be2f36a90ba07acb11b3de9db190fef91 | |
| parent | c1bb0e09116c725766f5fa6b4a7ddfef28ef7e96 (diff) | |
| parent | a6fa0e0fdbe18a937097d5ea03385f9591ee18b1 (diff) | |
| download | rust-89158e210ce0b9550b42c65ede244087f2e144b5.tar.gz rust-89158e210ce0b9550b42c65ede244087f2e144b5.zip | |
Auto merge of #110942 - Zalathar:coverage-tests, r=Mark-Simulacrum
Don't accidentally ignore all output in `tests/run-make/coverage-reports` diffs Because the literal pipe `|` character was not escaped, these regexes ended up accidentally ignoring every line in the coverage report output, so the tests would not fail even if the output was wrong.
| -rw-r--r-- | tests/run-make/coverage-reports/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/run-make/coverage-reports/Makefile b/tests/run-make/coverage-reports/Makefile index d06cd9c6a54..d4ae03e590a 100644 --- a/tests/run-make/coverage-reports/Makefile +++ b/tests/run-make/coverage-reports/Makefile @@ -174,7 +174,7 @@ 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='^ | <.*>::.*:$$' \ + $(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' \ |