Skip to content

Commit 608e228

Browse files
committed
Auto merge of rust-lang#137066 - onur-ozkan:137034-blocker, r=jieyouxu
check if CI-LLVM is enabled before testing it Blocker for rust-lang#137034
2 parents 69fd5e4 + b2d6a7f commit 608e228

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

src/bootstrap/src/core/builder/tests.rs

+15-12
Original file line numberDiff line numberDiff line change
@@ -1051,19 +1051,22 @@ fn test_prebuilt_llvm_config_path_resolution() {
10511051
"#,
10521052
);
10531053

1054-
let build = Build::new(config.clone());
1055-
let builder = Builder::new(&build);
1054+
// CI-LLVM isn't always available; check if it's enabled before testing.
1055+
if config.llvm_from_ci {
1056+
let build = Build::new(config.clone());
1057+
let builder = Builder::new(&build);
10561058

1057-
let actual = prebuilt_llvm_config(&builder, builder.config.build, false)
1058-
.llvm_result()
1059-
.llvm_config
1060-
.clone();
1061-
let expected = builder
1062-
.out
1063-
.join(builder.config.build)
1064-
.join("ci-llvm/bin")
1065-
.join(exe("llvm-config", builder.config.build));
1066-
assert_eq!(expected, actual);
1059+
let actual = prebuilt_llvm_config(&builder, builder.config.build, false)
1060+
.llvm_result()
1061+
.llvm_config
1062+
.clone();
1063+
let expected = builder
1064+
.out
1065+
.join(builder.config.build)
1066+
.join("ci-llvm/bin")
1067+
.join(exe("llvm-config", builder.config.build));
1068+
assert_eq!(expected, actual);
1069+
}
10671070
}
10681071

10691072
#[test]

0 commit comments

Comments
 (0)