summaryrefslogtreecommitdiffstats
path: root/src/tools/cargo/tests/testsuite/git.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/cargo/tests/testsuite/git.rs')
-rw-r--r--src/tools/cargo/tests/testsuite/git.rs31
1 files changed, 19 insertions, 12 deletions
diff --git a/src/tools/cargo/tests/testsuite/git.rs b/src/tools/cargo/tests/testsuite/git.rs
index e27315346..d9289acc6 100644
--- a/src/tools/cargo/tests/testsuite/git.rs
+++ b/src/tools/cargo/tests/testsuite/git.rs
@@ -591,12 +591,12 @@ fn recompilation() {
.run();
// Don't recompile the second time
- p.cargo("check").with_stdout("").run();
+ p.cargo("check").with_stderr("[FINISHED] [..]").run();
// Modify a file manually, shouldn't trigger a recompile
git_project.change_file("src/bar.rs", r#"pub fn bar() { println!("hello!"); }"#);
- p.cargo("check").with_stdout("").run();
+ p.cargo("check").with_stderr("[FINISHED] [..]").run();
p.cargo("update")
.with_stderr(&format!(
@@ -605,7 +605,7 @@ fn recompilation() {
))
.run();
- p.cargo("check").with_stdout("").run();
+ p.cargo("check").with_stderr("[FINISHED] [..]").run();
// Commit the changes and make sure we don't trigger a recompile because the
// lock file says not to change
@@ -614,7 +614,7 @@ fn recompilation() {
git::commit(&repo);
println!("compile after commit");
- p.cargo("check").with_stdout("").run();
+ p.cargo("check").with_stderr("[FINISHED] [..]").run();
p.root().move_into_the_past();
// Update the dependency and carry on!
@@ -638,7 +638,7 @@ fn recompilation() {
.run();
// Make sure clean only cleans one dep
- p.cargo("clean -p foo").with_stdout("").run();
+ p.cargo("clean -p foo").with_stderr("[REMOVED] [..]").run();
p.cargo("check")
.with_stderr(
"[CHECKING] foo v0.5.0 ([CWD])\n\
@@ -742,7 +742,14 @@ fn update_with_shared_deps() {
// By default, not transitive updates
println!("dep1 update");
- p.cargo("update dep1").with_stdout("").run();
+ p.cargo("update dep1")
+ .with_stderr(
+ "\
+[UPDATING] git repository [..]
+[UPDATING] bar v0.5.0 [..]
+",
+ )
+ .run();
// Don't do anything bad on a weird --precise argument
println!("bar bad precise update");
@@ -766,7 +773,7 @@ Caused by:
println!("bar precise update");
p.cargo("update bar --precise")
.arg(&old_head.to_string())
- .with_stdout("")
+ .with_stderr("[UPDATING] bar v0.5.0 [..]")
.run();
// Updating recursively should, however, update the repo.
@@ -1496,12 +1503,12 @@ fn git_build_cmd_freshness() {
// Smoke test to make sure it doesn't compile again
println!("first pass");
- foo.cargo("check").with_stdout("").run();
+ foo.cargo("check").with_stderr("[FINISHED] [..]").run();
// Modify an ignored file and make sure we don't rebuild
println!("second pass");
foo.change_file("src/bar.rs", "");
- foo.cargo("check").with_stdout("").run();
+ foo.cargo("check").with_stderr("[FINISHED] [..]").run();
}
#[cargo_test]
@@ -1636,7 +1643,7 @@ fn git_repo_changing_no_rebuild() {
// And now for the real test! Make sure that p1 doesn't get rebuilt
// even though the git repo has changed.
- p1.cargo("check").with_stdout("").run();
+ p1.cargo("check").with_stderr("[FINISHED] [..]").run();
}
#[cargo_test]
@@ -1741,7 +1748,7 @@ fn fetch_downloads() {
))
.run();
- p.cargo("fetch").with_stdout("").run();
+ p.cargo("fetch").with_stderr("").run();
}
#[cargo_test]
@@ -1786,7 +1793,7 @@ fn fetch_downloads_with_git2_first_then_with_gitoxide_and_vice_versa() {
.run();
Package::new("bar", "1.0.0").publish(); // trigger a crates-index change.
- p.cargo("fetch").with_stdout("").run();
+ p.cargo("fetch").with_stderr("").run();
}
#[cargo_test]