Skip to content

Commit

Permalink
test: relax panic output assertion (#14989)
Browse files Browse the repository at this point in the history
### What does this PR try to resolve?

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.
  • Loading branch information
Rustin170506 authored Dec 30, 2024
2 parents d0342d3 + b7d9861 commit 9b5efd9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
1 change: 1 addition & 0 deletions tests/build-std/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ fn remap_path_scope() {
str![[r#"
[FINISHED] `release` profile [optimized + debuginfo] target(s) in [ELAPSED]s
[RUNNING] `target/[HOST_TARGET]/release/foo`
...
[..]thread '[..]' panicked at [..]src/main.rs:3:[..]:
[..]remap to /rustc/<hash>[..]
[..]at /rustc/[..]/library/std/src/[..]
Expand Down
18 changes: 8 additions & 10 deletions tests/testsuite/build_script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4000,7 +4000,7 @@ fn warnings_emitted_when_build_script_panics() {
fn main() {
println!("cargo::warning=foo");
println!("cargo::warning=bar");
panic!();
panic!("our crate panicked");
}
"#,
)
Expand All @@ -4022,10 +4022,9 @@ Caused by:
cargo::warning=bar
--- stderr
thread 'main' panicked at build.rs:5:21:
explicit panic
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
...
[..]our crate panicked[..]
...
"#]])
.run();
}
Expand All @@ -4039,7 +4038,7 @@ fn warnings_emitted_when_dependency_panics() {
fn main() {
println!("cargo::warning=foo");
println!("cargo::warning=bar");
panic!();
panic!("dependency panicked");
}
"#,
)
Expand Down Expand Up @@ -4093,10 +4092,9 @@ Caused by:
cargo::warning=bar
--- stderr
thread 'main' panicked at [ROOT]/home/.cargo/registry/src/-[HASH]/published-0.1.0/build.rs:5:21:
explicit panic
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
...
[..]dependency panicked[..]
...
"#]])
.run();
}
Expand Down

0 comments on commit 9b5efd9

Please sign in to comment.