Skip to content

Commit db4fdb0

Browse files
committed
Toolchains: skip strip determinism test on bootstrap shards
Our strip determinism patch is not included in the GCC bootstrap shards, so we don't get deterministic windows output from them yet.
1 parent 47217b0 commit db4fdb0

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

BinaryBuilderToolchains.jl/test/CToolchainTests.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,12 @@ ENV["TESTSUITE_OUTPUT_DIR"] = mktempdir(;cleanup=false)
156156
# Next, run `make compile-all`
157157
@testset "make compile-all" begin
158158
cd(joinpath(@__DIR__, "testsuite", "CToolchain")) do
159-
p, output = capture_output(setenv(Cmd(["/bin/bash", "-c", "make clean-all && make compile-all"]), env))
159+
EXCLUDED_DIRS = String[]
160+
# the bootstrap GCC binutils doesn't have our deterministic strip patch
161+
if Sys.iswindows(target) && vendor == :gcc_bootstrap
162+
push!(EXCLUDED_DIRS, "08_strip_resigning")
163+
end
164+
p, output = capture_output(setenv(Cmd(["/bin/bash", "-c", "make clean-all && make compile-all EXCLUDED_DIRS='$(join(EXCLUDED_DIRS, " "))'"]), env))
160165
if !success(p)
161166
println(output)
162167

BinaryBuilderToolchains.jl/test/testsuite/CToolchain/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ clean-all: clean-$(1)
2020
cleancheck-all: cleancheck-$(1)
2121
endef
2222

23-
SUBDIRS = $(sort $(notdir $(realpath $(dir $(shell find . -mindepth 2 -maxdepth 2 -name Makefile -type f)))))
23+
SUBDIRS := $(sort $(notdir $(realpath $(dir $(shell find . -mindepth 2 -maxdepth 2 -name Makefile -type f)))))
24+
SUBDIRS := $(filter-out $(EXCLUDED_DIRS),$(SUBDIRS))
2425
$(foreach DIR,$(SUBDIRS),$(eval $(call make_test_group,$(DIR))))
2526

2627
print-%:

0 commit comments

Comments
 (0)