Skip to content

Commit

Permalink
Auto merge of rust-lang#137066 - onur-ozkan:137034-blocker, r=jieyouxu
Browse files Browse the repository at this point in the history
check if CI-LLVM is enabled before testing it

Blocker for rust-lang#137034
  • Loading branch information
bors committed Feb 15, 2025
2 parents 69fd5e4 + b2d6a7f commit 608e228
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions src/bootstrap/src/core/builder/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 608e228

Please sign in to comment.