From b2d6a7f6934f3050102e2bed16106aca38baf30f Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 15 Feb 2025 11:00:31 +0300 Subject: [PATCH] check if CI-LLVM is enabled before testing it Signed-off-by: onur-ozkan --- src/bootstrap/src/core/builder/tests.rs | 27 ++++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index a0be474ca3e39..5e3e0ef654fdf 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]