itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: relax panic output assertion

Browse Source 
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 rust-lang/cargo#14602,
this relaxes the assertion around that by globbing everything.
This commit is contained in:
Weihang Lo 2024-12-29 13:30:55 -05:00
parent 0276088d44
commit b7d98618b6
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/build-std/main.rs
View File

@ -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/[..]

18
tests/testsuite/build_script.rs
View File

@ -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");
}
"#,
)
@ -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();
}
@ -4039,7 +4038,7 @@ fn warnings_emitted_when_dependency_panics() {
fn main() {
println!("cargo::warning=foo");
println!("cargo::warning=bar");
panic!();
panic!("dependency panicked");
}
"#,
)
@ -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();
}