Skip to content

test: relax panic output assertion #14989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 30, 2024
Merged

test: relax panic output assertion #14989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/build-std/main.rs
View file
Open in desktop
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
View file
Open in desktop
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
Loading