Skip to content

Commit d097150

Browse files
committed
no need to run GC_STRESS more than once for each OS
1 parent 3c3539d commit d097150

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

ci/ci.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ function run_tests_minimal {
137137

138138
# In particular, fully cover all tier 1 targets.
139139
# We also want to run the many-seeds tests on all tier 1 targets.
140+
# We run GC_STRESS only once for each tier 1 OS.
140141
case $HOST_TARGET in
141142
x86_64-unknown-linux-gnu)
142143
# Host
@@ -147,7 +148,6 @@ case $HOST_TARGET in
147148
;;
148149
i686-unknown-linux-gnu)
149150
# Host
150-
# Without GC_STRESS as this is a slow runner.
151151
MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
152152
# Partially supported targets (tier 2)
153153
BASIC="empty_main integer heap_alloc libc-mem vec string btreemap" # ensures we have the basics: pre-main code, system allocator
@@ -159,7 +159,7 @@ case $HOST_TARGET in
159159
;;
160160
aarch64-unknown-linux-gnu)
161161
# Host
162-
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
162+
MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
163163
# Extra tier 2
164164
MANY_SEEDS=16 TEST_TARGET=arm-unknown-linux-gnueabi run_tests # 32bit ARM
165165
MANY_SEEDS=16 TEST_TARGET=aarch64-pc-windows-gnullvm run_tests # gnullvm ABI
@@ -170,7 +170,7 @@ case $HOST_TARGET in
170170
;;
171171
armv7-unknown-linux-gnueabihf)
172172
# Host
173-
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
173+
MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
174174
# Custom target JSON file
175175
TEST_TARGET=tests/x86_64-unknown-kernel.json MIRI_NO_STD=1 run_tests_minimal no_std
176176
;;
@@ -187,7 +187,6 @@ case $HOST_TARGET in
187187
;;
188188
i686-pc-windows-msvc)
189189
# Host
190-
# Without GC_STRESS as this is a very slow runner.
191190
MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 run_tests
192191
# Extra tier 1
193192
# We really want to ensure a Linux target works on a Windows host,
@@ -196,8 +195,7 @@ case $HOST_TARGET in
196195
;;
197196
aarch64-pc-windows-msvc)
198197
# Host
199-
# Without GC_STRESS as this is a very slow runner.
200-
MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
198+
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
201199
# Extra tier 1
202200
MANY_SEEDS=64 TEST_TARGET=i686-unknown-linux-gnu run_tests
203201
;;

0 commit comments

Comments
 (0)