diff options
| author | bors <bors@rust-lang.org> | 2025-02-15 14:58:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-15 14:58:47 +0000 |
| commit | 608e228ca9a1e57336ca5c16e5722a8ac8284d8d (patch) | |
| tree | 930fc633249b895e60b28d0d5ae30f4e035af709 | |
| parent | 69fd5e4059f8840f09f60269bcda23dcdcb77151 (diff) | |
| parent | b2d6a7f6934f3050102e2bed16106aca38baf30f (diff) | |
| download | rust-608e228ca9a1e57336ca5c16e5722a8ac8284d8d.tar.gz rust-608e228ca9a1e57336ca5c16e5722a8ac8284d8d.zip | |
Auto merge of #137066 - onur-ozkan:137034-blocker, r=jieyouxu
check if CI-LLVM is enabled before testing it Blocker for #137034
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 27 |
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] |
