skip mtime checks for paths in $CARGO_HOME

rust-lang · Jan 22, 2023 · 111a4a6 · 111a4a6
1 parent 48e0c53
commit 111a4a6
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 0 deletions.
diff --git a/src/cargo/core/compiler/fingerprint.rs b/src/cargo/core/compiler/fingerprint.rs
@@ -1785,6 1785,13 @@ where
 
  for path in paths {
  let path = path.as_ref();
 
  // check if path points to $CARGO_HOME and skip to avoid rebuilds when only caching
  // $CARGO_HOME/registry/{index, cache} and $CARGO_HOME/git/db
  // this lines up with discussions in #9455 about making $CARGO_HOME readonly
  if let Ok(true) = home::cargo_home().map(|home| path.starts_with(home)) {
  continue;
  }
  let path_mtime = match mtime_cache.entry(path.to_path_buf()) {
  Entry::Occupied(o) => *o.get(),
  Entry::Vacant(v) => {

diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
@@ -1,6 1,7 @@
 //! Tests for build.rs scripts.
 
 use cargo_test_support::compare::assert_match_exact;
 use cargo_test_support::install::cargo_home;
 use cargo_test_support::paths::CargoPathExt;
 use cargo_test_support::registry::Package;
 use cargo_test_support::tools;
@@ -4803,6 4804,84 @@ fn rerun_if_directory() {
  fresh();
 }
 
 #[cargo_test]
 fn rerun_if_published_directory() {
  // build script of a dependency contains a `rerun-if-changed` pointing to a directory
  Package::new("mylib-sys", "1.0.0")
  .file("mylib/balrog.c", "")
  .file("src/lib.rs", "")
  .file(
  "build.rs",
  r#"
  fn main() {
  // Changing to mylib/balrog.c will not trigger a rebuild
  println!("cargo:rerun-if-changed=mylib");
  }
  "#,
  )
  .publish();
 
  let p = project()
  .file(
  "Cargo.toml",
  r#"
  [package]
  name = "foo"
  version = "0.0.1"
 
  [dependencies]
  mylib-sys = "1.0.0"
  "#,
  )
  .file("src/main.rs", "fn main() {}")
  .build();
 
  p.cargo("check").run();
 
  // Delete regitry src to make directories being recreated with the latest timestamp.
  cargo_home().join("registry/src").rm_rf();
 
  p.cargo("check --verbose")
  .with_stderr(
  "\
 [FRESH] mylib-sys v1.0.0
 [FRESH] foo v0.0.1 ([CWD])
 [FINISHED] dev [unoptimized debuginfo] target(s) in [..]
 ",
  )
  .run();
 
  // Upgrade of a package should still trigger a rebuild
  Package::new("mylib-sys", "1.0.1")
  .file("mylib/balrog.c", "")
  .file("mylib/balrog.h", "")
  .file("src/lib.rs", "")
  .file(
  "build.rs",
  r#"
  fn main() {
  println!("cargo:rerun-if-changed=mylib");
  }
  "#,
  )
  .publish();
  p.cargo("update").run();
  p.cargo("fetch").run();
 
  p.cargo("check -v")
  .with_stderr(format!(
  "\
 [COMPILING] mylib-sys [..]
 [RUNNING] `rustc --crate-name build_script_build [..]
 [RUNNING] `[..]build-script-build[..]`
 [RUNNING] `rustc --crate-name mylib_sys [..]
 [CHECKING] foo [..]
 [RUNNING] `rustc --crate-name foo [..]
 [FINISHED] [..]",
  ))
  .run();
 }
 
 #[cargo_test]
 fn test_with_dep_metadata() {
  let p = project()