Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit f414afb

Browse files
KobzolKobzol
committed
Move freshness test to bootstrap
1 parent 432c4a8 commit f414afb

File tree

9 files changed

+396
-316
lines changed

9 files changed

+396
-316
lines changed

‎src/bootstrap/Cargo.lock

Lines changed: 79 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ dependencies = [
5656
"sha2",
5757
"sysinfo",
5858
"tar",
59+
"tempfile",
5960
"termcolor",
6061
"toml",
6162
"tracing",
@@ -233,14 +234,20 @@ dependencies = [
233234
"windows-sys 0.59.0",
234235
]
235236

237+
[[package]]
238+
name = "fastrand"
239+
version = "2.3.0"
240+
source = "registry+https://github.com/rust-lang/crates.io-index"
241+
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
242+
236243
[[package]]
237244
name = "fd-lock"
238245
version = "4.0.2"
239246
source = "registry+https://github.com/rust-lang/crates.io-index"
240247
checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
241248
dependencies = [
242249
"cfg-if",
243-
"rustix",
250+
"rustix 0.38.40",
244251
"windows-sys 0.52.0",
245252
]
246253

@@ -266,6 +273,18 @@ dependencies = [
266273
"version_check",
267274
]
268275

276+
[[package]]
277+
name = "getrandom"
278+
version = "0.3.2"
279+
source = "registry+https://github.com/rust-lang/crates.io-index"
280+
checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
281+
dependencies = [
282+
"cfg-if",
283+
"libc",
284+
"r-efi",
285+
"wasi",
286+
]
287+
269288
[[package]]
270289
name = "globset"
271290
version = "0.4.15"
@@ -355,6 +374,12 @@ version = "0.4.14"
355374
source = "registry+https://github.com/rust-lang/crates.io-index"
356375
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
357376

377+
[[package]]
378+
name = "linux-raw-sys"
379+
version = "0.9.3"
380+
source = "registry+https://github.com/rust-lang/crates.io-index"
381+
checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
382+
358383
[[package]]
359384
name = "log"
360385
version = "0.4.22"
@@ -486,6 +511,12 @@ dependencies = [
486511
"proc-macro2",
487512
]
488513

514+
[[package]]
515+
name = "r-efi"
516+
version = "5.2.0"
517+
source = "registry+https://github.com/rust-lang/crates.io-index"
518+
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
519+
489520
[[package]]
490521
name = "redox_syscall"
491522
version = "0.5.7"
@@ -548,10 +579,23 @@ dependencies = [
548579
"bitflags",
549580
"errno",
550581
"libc",
551-
"linux-raw-sys",
582+
"linux-raw-sys 0.4.14",
552583
"windows-sys 0.52.0",
553584
]
554585

586+
[[package]]
587+
name = "rustix"
588+
version = "1.0.2"
589+
source = "registry+https://github.com/rust-lang/crates.io-index"
590+
checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
591+
dependencies = [
592+
"bitflags",
593+
"errno",
594+
"libc",
595+
"linux-raw-sys 0.9.3",
596+
"windows-sys 0.59.0",
597+
]
598+
555599
[[package]]
556600
name = "ryu"
557601
version = "1.0.18"
@@ -678,6 +722,19 @@ dependencies = [
678722
"xattr",
679723
]
680724

725+
[[package]]
726+
name = "tempfile"
727+
version = "3.19.0"
728+
source = "registry+https://github.com/rust-lang/crates.io-index"
729+
checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
730+
dependencies = [
731+
"fastrand",
732+
"getrandom",
733+
"once_cell",
734+
"rustix 1.0.2",
735+
"windows-sys 0.59.0",
736+
]
737+
681738
[[package]]
682739
name = "termcolor"
683740
version = "1.4.1"
@@ -824,6 +881,15 @@ dependencies = [
824881
"winapi-util",
825882
]
826883

884+
[[package]]
885+
name = "wasi"
886+
version = "0.14.2+wasi-0.2.4"
887+
source = "registry+https://github.com/rust-lang/crates.io-index"
888+
checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
889+
dependencies = [
890+
"wit-bindgen-rt",
891+
]
892+
827893
[[package]]
828894
name = "winapi"
829895
version = "0.3.9"
@@ -990,15 +1056,24 @@ version = "0.52.6"
9901056
source = "registry+https://github.com/rust-lang/crates.io-index"
9911057
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
9921058

1059+
[[package]]
1060+
name = "wit-bindgen-rt"
1061+
version = "0.39.0"
1062+
source = "registry+https://github.com/rust-lang/crates.io-index"
1063+
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
1064+
dependencies = [
1065+
"bitflags",
1066+
]
1067+
9931068
[[package]]
9941069
name = "xattr"
9951070
version = "1.3.1"
9961071
source = "registry+https://github.com/rust-lang/crates.io-index"
9971072
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
9981073
dependencies = [
9991074
"libc",
1000-
"linux-raw-sys",
1001-
"rustix",
1075+
"linux-raw-sys 0.4.14",
1076+
"rustix 0.38.40",
10021077
]
10031078

10041079
[[package]]

‎src/bootstrap/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ features = [
8383

8484
[dev-dependencies]
8585
pretty_assertions = "1.4"
86+
tempfile = "3.15.0"
8687

8788
# We care a lot about bootstrap's compile times, so don't include debuginfo for
8889
# dependencies, only bootstrap itself.

‎src/bootstrap/src/core/config/tests.rs

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use std::path::{Path, PathBuf};
55
use std::{env, fs};
66

77
use build_helper::ci::CiEnv;
8+
use build_helper::git::PathFreshness;
89
use clap::CommandFactory;
910
use serde::Deserialize;
1011

@@ -15,6 +16,7 @@ use crate::core::build_steps::clippy::{LintConfig, get_clippy_rules_in_order};
1516
use crate::core::build_steps::llvm;
1617
use crate::core::build_steps::llvm::LLVM_INVALIDATION_PATHS;
1718
use crate::core::config::{LldMode, Target, TargetSelection, TomlConfig};
19+
use crate::utils::tests::git::git_test;
1820

1921
pub(crate) fn parse(config: &str) -> Config {
2022
Config::parse_inner(
@@ -744,3 +746,171 @@ fn test_include_precedence_over_profile() {
744746
// override profile settings, so we expect this to be "dev" here.
745747
assert_eq!(config.channel, "dev");
746748
}
749+
750+
#[test]
751+
fn test_pr_ci_unchanged_anywhere() {
752+
git_test(|ctx| {
753+
let sha = ctx.create_upstream_merge(&["a"]);
754+
ctx.create_nonupstream_merge(&["b"]);
755+
let src = ctx.check_modifications(&["c"], CiEnv::GitHubActions);
756+
assert_eq!(src, PathFreshness::LastModifiedUpstream { upstream: sha });
757+
});
758+
}
759+
760+
#[test]
761+
fn test_pr_ci_changed_in_pr() {
762+
git_test(|ctx| {
763+
let sha = ctx.create_upstream_merge(&["a"]);
764+
ctx.create_nonupstream_merge(&["b"]);
765+
let src = ctx.check_modifications(&["b"], CiEnv::GitHubActions);
766+
assert_eq!(src, PathFreshness::HasLocalModifications { upstream: sha });
767+
});
768+
}
769+
770+
#[test]
771+
fn test_auto_ci_unchanged_anywhere_select_parent() {
772+
git_test(|ctx| {
773+
let sha = ctx.create_upstream_merge(&["a"]);
774+
ctx.create_upstream_merge(&["b"]);
775+
let src = ctx.check_modifications(&["c"], CiEnv::GitHubActions);
776+
assert_eq!(src, PathFreshness::LastModifiedUpstream { upstream: sha });
777+
});
778+
}
779+
780+
#[test]
781+
fn test_auto_ci_changed_in_pr() {
782+
git_test(|ctx| {
783+
let sha = ctx.create_upstream_merge(&["a"]);
784+
ctx.create_upstream_merge(&["b", "c"]);
785+
let src = ctx.check_modifications(&["c", "d"], CiEnv::GitHubActions);
786+
assert_eq!(src, PathFreshness::HasLocalModifications { upstream: sha });
787+
});
788+
}
789+
790+
#[test]
791+
fn test_local_uncommitted_modifications() {
792+
git_test(|ctx| {
793+
let sha = ctx.create_upstream_merge(&["a"]);
794+
ctx.create_branch("feature");
795+
ctx.modify("a");
796+
797+
assert_eq!(
798+
ctx.check_modifications(&["a", "d"], CiEnv::None),
799+
PathFreshness::HasLocalModifications { upstream: sha }
800+
);
801+
});
802+
}
803+
804+
#[test]
805+
fn test_local_committed_modifications() {
806+
git_test(|ctx| {
807+
let sha = ctx.create_upstream_merge(&["a"]);
808+
ctx.create_upstream_merge(&["b", "c"]);
809+
ctx.create_branch("feature");
810+
ctx.modify("x");
811+
ctx.commit();
812+
ctx.modify("a");
813+
ctx.commit();
814+
815+
assert_eq!(
816+
ctx.check_modifications(&["a", "d"], CiEnv::None),
817+
PathFreshness::HasLocalModifications { upstream: sha }
818+
);
819+
});
820+
}
821+
822+
#[test]
823+
fn test_local_committed_modifications_subdirectory() {
824+
git_test(|ctx| {
825+
let sha = ctx.create_upstream_merge(&["a/b/c"]);
826+
ctx.create_upstream_merge(&["b", "c"]);
827+
ctx.create_branch("feature");
828+
ctx.modify("a/b/d");
829+
ctx.commit();
830+
831+
assert_eq!(
832+
ctx.check_modifications(&["a/b"], CiEnv::None),
833+
PathFreshness::HasLocalModifications { upstream: sha }
834+
);
835+
});
836+
}
837+
838+
#[test]
839+
fn test_local_changes_in_head_upstream() {
840+
git_test(|ctx| {
841+
// We want to resolve to the upstream commit that made modifications to a,
842+
// even if it is currently HEAD
843+
let sha = ctx.create_upstream_merge(&["a"]);
844+
assert_eq!(
845+
ctx.check_modifications(&["a", "d"], CiEnv::None),
846+
PathFreshness::LastModifiedUpstream { upstream: sha }
847+
);
848+
});
849+
}
850+
851+
#[test]
852+
fn test_local_changes_in_previous_upstream() {
853+
git_test(|ctx| {
854+
// We want to resolve to this commit, which modified a
855+
let sha = ctx.create_upstream_merge(&["a", "e"]);
856+
// Not to this commit, which is the latest upstream commit
857+
ctx.create_upstream_merge(&["b", "c"]);
858+
ctx.create_branch("feature");
859+
ctx.modify("d");
860+
ctx.commit();
861+
assert_eq!(
862+
ctx.check_modifications(&["a"], CiEnv::None),
863+
PathFreshness::LastModifiedUpstream { upstream: sha }
864+
);
865+
});
866+
}
867+
868+
#[test]
869+
fn test_local_no_upstream_commit_with_changes() {
870+
git_test(|ctx| {
871+
ctx.create_upstream_merge(&["a", "e"]);
872+
ctx.create_upstream_merge(&["a", "e"]);
873+
// We want to fall back to this commit, because there are no commits
874+
// that modified `x`.
875+
let sha = ctx.create_upstream_merge(&["a", "e"]);
876+
ctx.create_branch("feature");
877+
ctx.modify("d");
878+
ctx.commit();
879+
assert_eq!(
880+
ctx.check_modifications(&["x"], CiEnv::None),
881+
PathFreshness::LastModifiedUpstream { upstream: sha }
882+
);
883+
});
884+
}
885+
886+
#[test]
887+
fn test_local_no_upstream_commit() {
888+
git_test(|ctx| {
889+
let src = ctx.check_modifications(&["c", "d"], CiEnv::None);
890+
assert_eq!(src, PathFreshness::MissingUpstream);
891+
});
892+
}
893+
894+
#[test]
895+
fn test_local_changes_negative_path() {
896+
git_test(|ctx| {
897+
let upstream = ctx.create_upstream_merge(&["a"]);
898+
ctx.create_branch("feature");
899+
ctx.modify("b");
900+
ctx.modify("d");
901+
ctx.commit();
902+
903+
assert_eq!(
904+
ctx.check_modifications(&[":!b", ":!d"], CiEnv::None),
905+
PathFreshness::LastModifiedUpstream { upstream: upstream.clone() }
906+
);
907+
assert_eq!(
908+
ctx.check_modifications(&[":!c"], CiEnv::None),
909+
PathFreshness::HasLocalModifications { upstream: upstream.clone() }
910+
);
911+
assert_eq!(
912+
ctx.check_modifications(&[":!d", ":!x"], CiEnv::None),
913+
PathFreshness::HasLocalModifications { upstream }
914+
);
915+
});
916+
}

‎src/bootstrap/src/utils/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ pub(crate) mod tracing;
2020
pub(crate) mod metrics;
2121

2222
#[cfg(test)]
23-
mod tests;
23+
pub(crate) mod tests;

0 commit comments

Comments
 (0)