about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJakub Beránek <berykubik@gmail.com>2025-03-27 11:05:49 +0100
committerJakub Beránek <berykubik@gmail.com>2025-03-27 11:05:49 +0100
commit215c2c2f494e18791f9321f072a7c05c2f17238e (patch)
treea3b1922da7ae7296ed93c3bfdee65e3676b4adcd /src
parentea1da921c80c9296a81bce56330f178c125f0013 (diff)
downloadrust-215c2c2f494e18791f9321f072a7c05c2f17238e.tar.gz
rust-215c2c2f494e18791f9321f072a7c05c2f17238e.zip
Remove some asserts from the `download_ci_llvm` bootstrap test
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/src/core/config/tests.rs22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs
index 068e237c2cd..6d63709f474 100644
--- a/src/bootstrap/src/core/config/tests.rs
+++ b/src/bootstrap/src/core/config/tests.rs
@@ -24,31 +24,11 @@ pub(crate) fn parse(config: &str) -> Config {
 
 #[test]
 fn download_ci_llvm() {
-    let config = parse("");
-    let is_available = llvm::is_ci_llvm_available_for_target(&config, config.llvm_assertions);
-    if is_available {
-        assert!(config.llvm_from_ci);
-    }
-
-    let config = Config::parse_inner(
-        Flags::parse(&[
-            "check".to_string(),
-            "--config=/does/not/exist".to_string(),
-            "--ci".to_string(),
-            "false".to_string(),
-        ]),
-        |&_| toml::from_str("llvm.download-ci-llvm = true"),
-    );
-    let is_available = llvm::is_ci_llvm_available_for_target(&config, config.llvm_assertions);
-    if is_available {
-        assert!(config.llvm_from_ci);
-    }
-
     let config = parse("llvm.download-ci-llvm = false");
     assert!(!config.llvm_from_ci);
 
     let if_unchanged_config = parse("llvm.download-ci-llvm = \"if-unchanged\"");
-    if if_unchanged_config.llvm_from_ci {
+    if if_unchanged_config.llvm_from_ci && if_unchanged_config.is_running_on_ci {
         let has_changes = if_unchanged_config
             .last_modified_commit(LLVM_INVALIDATION_PATHS, "download-ci-llvm", true)
             .is_none();