Skip to content

check if CI-LLVM is enabled before testing it #137066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading