user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #137066 - onur-ozkan:137034-blocker, r=jieyouxu

Browse source 
check if CI-LLVM is enabled before testing it

Blocker for #137034
This commit is contained in:
bors 2025-02-15 14:58:47 +00:00
commit 608e228ca9
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/bootstrap/src/core/builder/tests.rs
View file

@ -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]