Skip to content

Commit 31c55d2

Browse files
committed
test: relax panic output assertion
rust-lang/rust#122565 adds a new line to thread panic output. To make the current test suites works on stable, beta, and nightly, similar to #14602, this relaxes the assertion around that by globbing everything.
1 parent 0276088 commit 31c55d2

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

tests/build-std/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ fn remap_path_scope() {
376376
str![[r#"
377377
[FINISHED] `release` profile [optimized + debuginfo] target(s) in [ELAPSED]s
378378
[RUNNING] `target/[HOST_TARGET]/release/foo`
379+
...
379380
[..]thread '[..]' panicked at [..]src/main.rs:3:[..]:
380381
[..]remap to /rustc/<hash>[..]
381382
[..]at /rustc/[..]/library/std/src/[..]

tests/testsuite/build_script.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4022,6 +4022,7 @@ Caused by:
40224022
cargo::warning=bar
40234023
40244024
--- stderr
4025+
...
40254026
thread 'main' panicked at build.rs:5:21:
40264027
explicit panic
40274028
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
@@ -4093,6 +4094,7 @@ Caused by:
40934094
cargo::warning=bar
40944095
40954096
--- stderr
4097+
...
40964098
thread 'main' panicked at [ROOT]/home/.cargo/registry/src/-[HASH]/published-0.1.0/build.rs:5:21:
40974099
explicit panic
40984100
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace

0 commit comments

Comments
 (0)