Auto merge of #1613 - RalfJung:test-normalize, r=RalfJung

backtrace tests: support more ways of checking out Rust locally Tests failed when using a local build as my folders are called `rustc`, `rustc.2`, ... Expand the regex to also support that naming scheme.
rust-lang · Oct 31, 2020 · 9a2cfbf · 9a2cfbf
2 parents e4840ef + e7246be
commit 9a2cfbf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tests/run-pass/backtrace-api.rs b/tests/run-pass/backtrace-api.rs
@@ -1,4 +1,4 @@
-// normalize-stderr-test ".*/(rust|checkout)/library/" -> "RUSTLIB/"
+// normalize-stderr-test ".*/(rust[^/]*|checkout)/library/" -> "RUSTLIB/"
 // normalize-stderr-test "RUSTLIB/(.*):\d+:\d+ "-> "RUSTLIB/$1:LL:COL "
 // normalize-stderr-test "::<.*>" -> ""
 

diff --git a/tests/run-pass/backtrace-std.rs b/tests/run-pass/backtrace-std.rs
@@ -1,4 +1,4 @@
-// normalize-stderr-test "at .*/(rust|checkout)/library/" -> "at RUSTLIB/"
+// normalize-stderr-test "at .*/(rust[^/]*|checkout)/library/" -> "at RUSTLIB/"
 // normalize-stderr-test "RUSTLIB/(.*):\d+"-> "RUSTLIB/$1:LL"
 // normalize-stderr-test "::<.*>" -> ""
 // compile-flags: -Zmiri-disable-isolation

diff --git a/tests/run-pass/panic/panic1.rs b/tests/run-pass/panic/panic1.rs
@@ -1,6 +1,6 @@
 // rustc-env: RUST_BACKTRACE=1
 // compile-flags: -Zmiri-disable-isolation
-// normalize-stderr-test "at .*/(rust|checkout)/library/.*" -> "at RUSTLIB/$$FILE:LL:COL"
+// normalize-stderr-test "at .*/(rust[^/]*|checkout)/library/.*" -> "at RUSTLIB/$$FILE:LL:COL"
 // normalize-stderr-test "::<.*>" -> ""