itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +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,
this relaxes the assertion around that by globbing everything.
This commit is contained in:
Weihang Lo 2024-09-26 15:19:28 -04:00
parent 9d66d13e44
commit 498ae399bf
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/testsuite/freshness.rs
View File

@ -1891,6 +1891,7 @@ test t1 ... FAILED
failures: failures:
---- t1 stdout ---- ---- t1 stdout ----
...
thread 't1' panicked at src/lib.rs:8:21: thread 't1' panicked at src/lib.rs:8:21:
assertion `left == right` failed: doit assert failure assertion `left == right` failed: doit assert failure
left: 2 left: 2
@ -1958,6 +1959,7 @@ Caused by:
cargo::rerun-if-changed=build.rs cargo::rerun-if-changed=build.rs
--- stderr --- stderr
...
thread 'main' panicked at helper.rs:1:16: thread 'main' panicked at helper.rs:1:16:
Crash! Crash!
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
@ -1977,6 +1979,7 @@ Caused by:
cargo::rerun-if-changed=build.rs cargo::rerun-if-changed=build.rs
--- stderr --- stderr
...
thread 'main' panicked at helper.rs:1:16: thread 'main' panicked at helper.rs:1:16:
Crash! Crash!
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace

1
tests/testsuite/install.rs
View File

@ -1327,6 +1327,7 @@ fn reports_unsuccessful_subcommand_result() {
cargo_process("fail") cargo_process("fail")
.with_status(101) .with_status(101)
.with_stderr_data(str![[r#" .with_stderr_data(str![[r#"
...
thread 'main' panicked at [ROOT]/home/.cargo/registry/src/-[HASH]/cargo-fail-1.0.0/src/main.rs:1:13: thread 'main' panicked at [ROOT]/home/.cargo/registry/src/-[HASH]/cargo-fail-1.0.0/src/main.rs:1:13:
explicit panic explicit panic
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace

6
tests/testsuite/jobserver.rs
View File

@ -232,6 +232,7 @@ this is a runner
.with_stderr_data(str![[r#" .with_stderr_data(str![[r#"
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[RUNNING] `target/debug/cargo-jobserver-check[EXE]` [RUNNING] `target/debug/cargo-jobserver-check[EXE]`
...
thread 'main' panicked at src/main.rs:5:43: thread 'main' panicked at src/main.rs:5:43:
no jobserver from env: NotPresent no jobserver from env: NotPresent
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
@ -248,9 +249,11 @@ no jobserver from env: NotPresent
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[RUNNING] `runner target/debug/cargo-jobserver-check[EXE]` [RUNNING] `runner target/debug/cargo-jobserver-check[EXE]`
this is a runner this is a runner
...
thread 'main' panicked at src/main.rs:5:43: thread 'main' panicked at src/main.rs:5:43:
no jobserver from env: NotPresent no jobserver from env: NotPresent
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
...
thread 'main' panicked at src/main.rs:6:17: thread 'main' panicked at src/main.rs:6:17:
assertion failed: status.success() assertion failed: status.success()
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
@ -268,6 +271,7 @@ test test ... FAILED
failures: failures:
---- test stdout ---- ---- test stdout ----
...
thread 'test' panicked at src/lib.rs:4:42: thread 'test' panicked at src/lib.rs:4:42:
no jobserver from env: NotPresent no jobserver from env: NotPresent
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
@ -290,6 +294,7 @@ test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out;
[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[RUNNING] unittests src/lib.rs (target/debug/deps/cargo_jobserver_check-[HASH][EXE]) [RUNNING] unittests src/lib.rs (target/debug/deps/cargo_jobserver_check-[HASH][EXE])
this is a runner this is a runner
...
thread 'main' panicked at src/main.rs:6:17: thread 'main' panicked at src/main.rs:6:17:
assertion failed: status.success() assertion failed: status.success()
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
@ -304,6 +309,7 @@ test test ... FAILED
failures: failures:
---- test stdout ---- ---- test stdout ----
...
thread 'test' panicked at src/lib.rs:4:42: thread 'test' panicked at src/lib.rs:4:42:
no jobserver from env: NotPresent no jobserver from env: NotPresent
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace

1
tests/testsuite/test.rs
View File

@ -516,6 +516,7 @@ test test_hello ... FAILED
failures: failures:
---- test_hello stdout ---- ---- test_hello stdout ----
...
thread 'test_hello' panicked at src/lib.rs:1:27: thread 'test_hello' panicked at src/lib.rs:1:27:
assertion failed: false assertion failed: false
... ...