Skip to content

Commit 215c2c2

Browse files
committed
Remove some asserts from the download_ci_llvm bootstrap test
1 parent ea1da92 commit 215c2c2

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

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

+1-21
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,11 @@ pub(crate) fn parse(config: &str) -> Config {
2424

2525
#[test]
2626
fn download_ci_llvm() {
27-
let config = parse("");
28-
let is_available = llvm::is_ci_llvm_available_for_target(&config, config.llvm_assertions);
29-
if is_available {
30-
assert!(config.llvm_from_ci);
31-
}
32-
33-
let config = Config::parse_inner(
34-
Flags::parse(&[
35-
"check".to_string(),
36-
"--config=/does/not/exist".to_string(),
37-
"--ci".to_string(),
38-
"false".to_string(),
39-
]),
40-
|&_| toml::from_str("llvm.download-ci-llvm = true"),
41-
);
42-
let is_available = llvm::is_ci_llvm_available_for_target(&config, config.llvm_assertions);
43-
if is_available {
44-
assert!(config.llvm_from_ci);
45-
}
46-
4727
let config = parse("llvm.download-ci-llvm = false");
4828
assert!(!config.llvm_from_ci);
4929

5030
let if_unchanged_config = parse("llvm.download-ci-llvm = \"if-unchanged\"");
51-
if if_unchanged_config.llvm_from_ci {
31+
if if_unchanged_config.llvm_from_ci && if_unchanged_config.is_running_on_ci {
5232
let has_changes = if_unchanged_config
5333
.last_modified_commit(LLVM_INVALIDATION_PATHS, "download-ci-llvm", true)
5434
.is_none();

0 commit comments

Comments
 (0)