Merging upstream version 1.73.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 61 insertions, 1 deletions

diff --git a/src/tools/cargo/tests/testsuite/freshness.rs b/src/tools/cargo/tests/testsuite/freshness.rs
index 86b186af8..f28f1ff46 100644
--- a/src/tools/cargo/tests/testsuite/freshness.rs
+++ b/src/tools/cargo/tests/testsuite/freshness.rs
@@ -14,7 +14,8 @@ use super::death;
 use cargo_test_support::paths::{self, CargoPathExt};
 use cargo_test_support::registry::Package;
 use cargo_test_support::{
-    basic_manifest, is_coarse_mtime, project, rustc_host, rustc_host_env, sleep_ms,
+    basic_lib_manifest, basic_manifest, is_coarse_mtime, project, rustc_host, rustc_host_env,
+    sleep_ms,
 };
 
 #[cargo_test]
@@ -2814,3 +2815,62 @@ directory sources are not [..]
         )
         .run();
 }
+
+#[cargo_test]
+fn skip_mtime_check_in_selected_cargo_home_subdirs() {
+    let p = project()
+        .at("cargo_home/registry/foo")
+        .file("Cargo.toml", &basic_lib_manifest("foo"))
+        .file("src/lib.rs", "")
+        .build();
+    let project_root = p.root();
+    let cargo_home = project_root.parent().unwrap().parent().unwrap();
+    p.cargo("check -v")
+        .env("CARGO_HOME", &cargo_home)
+        .with_stderr(
+            "\
+[CHECKING] foo v0.5.0 ([CWD])
+[RUNNING] `rustc --crate-name foo src/lib.rs [..]
+[FINISHED] dev [..]",
+        )
+        .run();
+    p.change_file("src/lib.rs", "illegal syntax");
+    p.cargo("check -v")
+        .env("CARGO_HOME", &cargo_home)
+        .with_stderr(
+            "\
+[FRESH] foo v0.5.0 ([CWD])
+[FINISHED] dev [..]",
+        )
+        .run();
+}
+
+#[cargo_test]
+fn use_mtime_cache_in_cargo_home() {
+    let p = project()
+        .at("cargo_home/foo")
+        .file("Cargo.toml", &basic_lib_manifest("foo"))
+        .file("src/lib.rs", "")
+        .build();
+    let project_root = p.root();
+    let cargo_home = project_root.parent().unwrap();
+    p.cargo("check -v")
+        .env("CARGO_HOME", &cargo_home)
+        .with_stderr(
+            "\
+[CHECKING] foo v0.5.0 ([CWD])
+[RUNNING] `rustc --crate-name foo src/lib.rs [..]
+[FINISHED] dev [..]",
+        )
+        .run();
+    p.change_file("src/lib.rs", "illegal syntax");
+    p.cargo("check -v")
+        .env("CARGO_HOME", &cargo_home)
+        .with_stderr(
+            "\
+[DIRTY] foo v0.5.0 ([CWD]): [..]
+[CHECKING] foo v0.5.0 ([CWD])
+[RUNNING] `rustc --crate-name foo src/lib.rs [..]",
+        )
+        .run_expect_error();
+}