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

fix(test): Restore does_not_contain for check

Browse Source 
This is partial revert of #14185
(27062476a86e864479ef6bde1828c624b643de4b)

Although the changes made in that commit are valid, for the same reason
mentioned in the comment https://github.com/rust-lang/cargo/pull/14181#discussion_r1667089718,
"People are unlikely to see these comments when updating snapshots".
Therefore, it would be better to revert these parts.
This commit is contained in:
eth3lbert 2024-07-06 06:10:37 +08:00
parent be1db6ca60
commit 68185614e2
No known key found for this signature in database
1 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
tests/testsuite/check.rs
View File

@ -407,6 +407,7 @@ fn check_all() {
.run(); .run();
} }
#[allow(deprecated)]
#[cargo_test] #[cargo_test]
fn check_all_exclude() { fn check_all_exclude() {
let p = project() let p = project()
@ -424,8 +425,7 @@ fn check_all_exclude() {
.build(); .build();
p.cargo("check --workspace --exclude baz") p.cargo("check --workspace --exclude baz")
// does_not_contain .with_stderr_does_not_contain("[CHECKING] baz v0.1.0 [..]")
// [CHECKING] baz v0.1.0 [..]
.with_stderr_data(str![[r#" .with_stderr_data(str![[r#"
[LOCKING] 2 packages to latest compatible versions [LOCKING] 2 packages to latest compatible versions
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar) [CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
@ -435,6 +435,7 @@ fn check_all_exclude() {
.run(); .run();
} }
#[allow(deprecated)]
#[cargo_test] #[cargo_test]
fn check_all_exclude_glob() { fn check_all_exclude_glob() {
let p = project() let p = project()
@ -452,8 +453,7 @@ fn check_all_exclude_glob() {
.build(); .build();
p.cargo("check --workspace --exclude '*z'") p.cargo("check --workspace --exclude '*z'")
// does_not_contain .with_stderr_does_not_contain("[CHECKING] baz v0.1.0 [..]")
// [CHECKING] baz v0.1.0 [..]
.with_stderr_data(str![[r#" .with_stderr_data(str![[r#"
[LOCKING] 2 packages to latest compatible versions [LOCKING] 2 packages to latest compatible versions
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar) [CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
@ -495,6 +495,7 @@ fn check_virtual_all_implied() {
.run(); .run();
} }
#[allow(deprecated)]
#[cargo_test] #[cargo_test]
fn check_virtual_manifest_one_project() { fn check_virtual_manifest_one_project() {
let p = project() let p = project()
@ -512,8 +513,7 @@ fn check_virtual_manifest_one_project() {
.build(); .build();
p.cargo("check -p bar") p.cargo("check -p bar")
// does_not_contain .with_stderr_does_not_contain("[CHECKING] baz v0.1.0 [..]")
// [CHECKING] baz v0.1.0 [..]
.with_stderr_data(str![[r#" .with_stderr_data(str![[r#"
[LOCKING] 2 packages to latest compatible versions [LOCKING] 2 packages to latest compatible versions
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar) [CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
@ -523,6 +523,7 @@ fn check_virtual_manifest_one_project() {
.run(); .run();
} }
#[allow(deprecated)]
#[cargo_test] #[cargo_test]
fn check_virtual_manifest_glob() { fn check_virtual_manifest_glob() {
let p = project() let p = project()
@ -540,8 +541,7 @@ fn check_virtual_manifest_glob() {
.build(); .build();
p.cargo("check -p '*z'") p.cargo("check -p '*z'")
// does_not_contain .with_stderr_does_not_contain("[CHECKING] bar v0.1.0 [..]")
// [CHECKING] bar v0.1.0 [..]
.with_stderr_data(str![[r#" .with_stderr_data(str![[r#"
[LOCKING] 2 packages to latest compatible versions [LOCKING] 2 packages to latest compatible versions
[CHECKING] baz v0.1.0 ([ROOT]/foo/baz) [CHECKING] baz v0.1.0 ([ROOT]/foo/baz)
@ -565,6 +565,7 @@ fn exclude_warns_on_non_existing_package() {
.run(); .run();
} }
#[allow(deprecated)]
#[cargo_test] #[cargo_test]
fn targets_selected_default() { fn targets_selected_default() {
let foo = project() let foo = project()
@ -576,17 +577,11 @@ fn targets_selected_default() {
.build(); .build();
foo.cargo("check -v") foo.cargo("check -v")
// shold not contain .with_stderr_contains("[..] --crate-name foo [..] src/lib.rs [..]")
// [..] --crate-name example1 [..] examples/example1.rs [..] .with_stderr_contains("[..] --crate-name foo [..] src/main.rs [..]")
// [..] --crate-name test2 [..] tests/test2.rs [..] .with_stderr_does_not_contain("[..] --crate-name example1 [..] examples/example1.rs [..]")
// [..] --crate-name bench3 [..] benches/bench3.rs [..] .with_stderr_does_not_contain("[..] --crate-name test2 [..] tests/test2.rs [..]")
.with_stderr_data(str![[r#" .with_stderr_does_not_contain("[..] --crate-name bench3 [..] benches/bench3.rs [..]")
[CHECKING] foo v0.0.1 ([ROOT]/foo)
[RUNNING] `rustc --crate-name foo [..] src/lib.rs [..]`
[RUNNING] `rustc --crate-name foo [..] src/main.rs [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
"#]])
.run(); .run();
} }
@ -1011,6 +1006,7 @@ WRAPPER CALLED: rustc --crate-name foo [..]
.run(); .run();
} }
#[allow(deprecated)]
#[cargo_test] #[cargo_test]
fn rustc_workspace_wrapper_respects_primary_units() { fn rustc_workspace_wrapper_respects_primary_units() {
let p = project() let p = project()
@ -1029,18 +1025,12 @@ fn rustc_workspace_wrapper_respects_primary_units() {
p.cargo("check -p bar") p.cargo("check -p bar")
.env("RUSTC_WORKSPACE_WRAPPER", tools::echo_wrapper()) .env("RUSTC_WORKSPACE_WRAPPER", tools::echo_wrapper())
// should not contain .with_stderr_contains("WRAPPER CALLED: rustc --crate-name bar [..]")
// WRAPPER CALLED: rustc --crate-name baz [..] .with_stdout_does_not_contain("WRAPPER CALLED: rustc --crate-name baz [..]")
.with_stderr_data(str![[r#"
[LOCKING] 2 packages to latest compatible versions
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
WRAPPER CALLED: rustc --crate-name bar [..]
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
"#]])
.run(); .run();
} }
#[allow(deprecated)]
#[cargo_test] #[cargo_test]
fn rustc_workspace_wrapper_excludes_published_deps() { fn rustc_workspace_wrapper_excludes_published_deps() {
let p = project() let p = project()
@ -1069,27 +1059,10 @@ fn rustc_workspace_wrapper_excludes_published_deps() {
p.cargo("check --workspace -v") p.cargo("check --workspace -v")
.env("RUSTC_WORKSPACE_WRAPPER", tools::echo_wrapper()) .env("RUSTC_WORKSPACE_WRAPPER", tools::echo_wrapper())
// does_not_contain .with_stderr_contains("WRAPPER CALLED: rustc --crate-name foo [..]")
// WRAPPER CALLED: rustc --crate-name baz [..] .with_stderr_contains("WRAPPER CALLED: rustc --crate-name bar [..]")
.with_stderr_data( .with_stderr_contains("[CHECKING] baz [..]")
str![[r#" .with_stdout_does_not_contain("WRAPPER CALLED: rustc --crate-name baz [..]")
[UPDATING] `dummy-registry` index
[LOCKING] 3 packages to latest compatible versions
[DOWNLOADING] crates ...
[DOWNLOADED] baz v1.0.0 (registry `dummy-registry`)
[CHECKING] baz v1.0.0
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
[CHECKING] foo v0.1.0 ([ROOT]/foo)
[RUNNING] `[..]`
[RUNNING] `[..]`
[RUNNING] `[..]`
WRAPPER CALLED: rustc --crate-name bar [..]
WRAPPER CALLED: rustc --crate-name foo [..]
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
"#]]
.unordered(),
)
.run(); .run();
} }