about summary refs log tree commit diff
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2025-02-15 11:00:31 +0300
committeronur-ozkan <work@onurozkan.dev>2025-02-15 11:00:31 +0300
commitb2d6a7f6934f3050102e2bed16106aca38baf30f (patch)
tree6861ce6662f4627e9d3d7ba84e004288d4bae925
parentf77247ac59b29ce927f4d2cd1c26a4b2d1d358c9 (diff)
downloadrust-b2d6a7f6934f3050102e2bed16106aca38baf30f.tar.gz
rust-b2d6a7f6934f3050102e2bed16106aca38baf30f.zip
check if CI-LLVM is enabled before testing it
Signed-off-by: onur-ozkan <work@onurozkan.dev>
-rw-r--r--src/bootstrap/src/core/builder/tests.rs27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index a0be474ca3e..5e3e0ef654f 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -1051,19 +1051,22 @@ fn test_prebuilt_llvm_config_path_resolution() {
         "#,
     );
 
-    let build = Build::new(config.clone());
-    let builder = Builder::new(&build);
+    // CI-LLVM isn't always available; check if it's enabled before testing.
+    if config.llvm_from_ci {
+        let build = Build::new(config.clone());
+        let builder = Builder::new(&build);
 
-    let actual = prebuilt_llvm_config(&builder, builder.config.build, false)
-        .llvm_result()
-        .llvm_config
-        .clone();
-    let expected = builder
-        .out
-        .join(builder.config.build)
-        .join("ci-llvm/bin")
-        .join(exe("llvm-config", builder.config.build));
-    assert_eq!(expected, actual);
+        let actual = prebuilt_llvm_config(&builder, builder.config.build, false)
+            .llvm_result()
+            .llvm_config
+            .clone();
+        let expected = builder
+            .out
+            .join(builder.config.build)
+            .join("ci-llvm/bin")
+            .join(exe("llvm-config", builder.config.build));
+        assert_eq!(expected, actual);
+    }
 }
 
 #[test]