Skip to content

Commit c0484fe

Browse files
committed
Limit bootstrap vendor testing to x86_64.
Although we may eventually make this work, it's just not a high priority right now.
1 parent 398f7ed commit c0484fe

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

BinaryBuilderToolchains.jl/test/CMakeToolchainTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ENV["TESTSUITE_OUTPUT_DIR"] = mktempdir()
7979
@info("Running cmake tests for $(length(supported_platforms(CToolchain))) platforms")
8080
for target in supported_platforms(CMakeToolchain)
8181
target_platform = CrossPlatform(BBHostPlatform() => target)
82-
for vendor in (:auto, :gcc, :clang, :gcc_bootstrap, :clang_bootstrap)
82+
for vendor in vendors_to_test()
8383
c_toolchain = CToolchain(target_platform; vendor, use_ccache=false)
8484
cmake_toolchain = CMakeToolchain(target_platform)
8585
hosttools_toolchain = HostToolsToolchain(target_platform)

BinaryBuilderToolchains.jl/test/CToolchainTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ ENV["TESTSUITE_OUTPUT_DIR"] = mktempdir(;cleanup=false)
138138
@info("Running `\$CC` tests for $(length(supported_platforms(CToolchain))) platforms")
139139
for target in supported_platforms(CToolchain)
140140
target_platform = CrossPlatform(BBHostPlatform() => target)
141-
for vendor in (:auto, :gcc, :clang, :gcc_bootstrap, :clang_bootstrap)
141+
for vendor in vendors_to_test()
142142
toolchain = CToolchain(target_platform; vendor, use_ccache=false)
143143
with_toolchains([toolchain, htt_toolchain]) do prefix, env
144144
@testset "$(triplet(target)) - $(vendor)" begin

BinaryBuilderToolchains.jl/test/common.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ function capture_output(cmd)
88
return p, output
99
end
1010

11+
function vendors_to_test(curr_arch = arch(BBHostPlatform()))
12+
# Only test the `*_bootstrap` vendors on x86_64, where I actually did the bootstrapping.
13+
if curr_arch == "x86_64"
14+
return (:auto, :gcc, :clang, :gcc_bootstrap, :clang_bootstrap)
15+
else
16+
return (:auto, :gcc, :clang)
17+
end
18+
end
19+
1120
function toolchain_tests(prefix, env, platform, testsuite; do_cxxabi_tests::Bool = false)
1221
testsuite_path = joinpath(@__DIR__, "testsuite", testsuite)
1322
cd(testsuite_path) do

0 commit comments

Comments
 (0)