Skip to content

Commit cff9578

Browse files
committed
update things and trigger rebuild
1 parent afbe57d commit cff9578

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

run-tests.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ for arch in $ARCHS; do
197197
esac
198198
done
199199
done
200+
TEST_ASAN_CFGUARD=
200201
for test in $TESTS_ASAN; do
201202
case $arch in
202203
# Sanitizers on windows only support x86.
@@ -208,6 +209,7 @@ for arch in $ARCHS; do
208209
# Only run these tests on native windows; asan doesn't run in wine.
209210
if [ -n "$NATIVE" ]; then
210211
TESTS_EXTRA="$TESTS_EXTRA $test"
212+
TEST_ASAN_CFGUARD="$TEST_ASAN_CFGUARD $test"
211213
fi
212214
done
213215
for test in $TESTS_UBSAN; do
@@ -267,21 +269,22 @@ for arch in $ARCHS; do
267269
if $RUN $test.exe check_enabled; then
268270
$RUN $test.exe normal_icall
269271
$RUN $test.exe invalid_icall_nocf || [ $? = 2 ]
270-
# We want to check the exit code to be 0xc0000409. MSYS2 bash
271-
# does not give us the full 8-bit exit code, so we have to rely
272-
# on cmd.exe to perform the check.
272+
# We want to check the exit code to be 0xc0000409
273+
# (STATUS_STACK_BUFFER_OVERRUN aka fail fast exception). MSYS2
274+
# bash does not give us the full 32-bit exit code, so we have
275+
# to rely on cmd.exe to perform the check.
276+
# (This doesn't work on WINE, but WINE doesn't support CFG
277+
# anyway, at least not for now...)
273278
cmd //c "$test.exe invalid_icall & if errorlevel -1073740791 (if not errorlevel -1073740790 (exit 0)) & exit 1"
274279
fi
275280
fi
276281
done
277-
if [ -n "$NATIVE" ]; then
278-
for test in $TESTS_ASAN; do
279-
if [ -n "$RUN" ]; then
280-
$RUN $test-asan-cfguard.exe
281-
$RUN $test-asan-cfguard.exe crash || echo $?
282-
fi
283-
done
284-
fi
282+
for test in $TEST_ASAN_CFGUARD; do
283+
if [ -n "$RUN" ]; then
284+
$RUN $test-asan-cfguard.exe
285+
$RUN $test-asan-cfguard.exe crash || echo $?
286+
fi
287+
done
285288
cd ..
286289
done
287290
echo All tests succeeded

0 commit comments

Comments
 (0)