about summary refs log tree commit diff
diff options
context:
space:
mode:
authorZalathar <Zalathar@users.noreply.github.com>2023-04-28 15:32:16 +1000
committerZalathar <Zalathar@users.noreply.github.com>2023-04-28 20:45:34 +1000
commita6fa0e0fdbe18a937097d5ea03385f9591ee18b1 (patch)
tree2fc6b31dfcb471372c680415f0b5c706e66dc561
parent2fce2290865f012391b8f3e581c3852a248031fa (diff)
downloadrust-a6fa0e0fdbe18a937097d5ea03385f9591ee18b1.tar.gz
rust-a6fa0e0fdbe18a937097d5ea03385f9591ee18b1.zip
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/Makefile2
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' \