Skip to content

Commit 4700b4f

Browse files
committed
test: Skip building the ubsan and openmp tests for arm64ec
Also unset RUN for arm64ec, instead of accidentally inheriting the earlier value.
1 parent cb92de7 commit 4700b4f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

run-tests.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ fi
174174

175175
for arch in $ARCHS; do
176176
unset HAVE_ASAN
177+
HAVE_UBSAN=1
178+
HAVE_OPENMP=1
177179
case $arch in
178180
i686)
179181
RUN="$RUN_I686"
@@ -201,6 +203,11 @@ for arch in $ARCHS; do
201203
COPY="$COPY_AARCH64"
202204
NATIVE="$NATIVE_AARCH64"
203205
;;
206+
arm64ec)
207+
unset HAVE_UBSAN
208+
unset HAVE_OPENMP
209+
unset RUN
210+
;;
204211
esac
205212

206213
TARGET=all
@@ -219,8 +226,8 @@ for arch in $ARCHS; do
219226
[ -z "$CLEAN" ] || rm -rf $TEST_DIR
220227
mkdir -p $TEST_DIR
221228
cd $TEST_DIR
222-
$MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_ASAN=$HAVE_ASAN NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin clean
223-
$MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_ASAN=$HAVE_ASAN NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin RUN="$RUN" $COPYARG $MAKEOPTS -j$CORES $TARGET
229+
$MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_ASAN=$HAVE_ASAN HAVE_UBSAN=$HAVE_UBSAN HAVE_OPENMP=$HAVE_OPENMP NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin clean
230+
$MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_ASAN=$HAVE_ASAN HAVE_UBSAN=$HAVE_UBSAN HAVE_OPENMP=$HAVE_OPENMP NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin RUN="$RUN" $COPYARG $MAKEOPTS -j$CORES $TARGET
224231
cd ..
225232
done
226233
echo All tests succeeded

test/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ TESTS_FORTIFY = bufferoverflow crt-test
8080
ifneq ($(HAVE_ASAN),)
8181
TESTS_ASAN = stacksmash
8282
endif
83-
TESTS_UBSAN = ubsan
83+
ifneq ($(HAVE_UBSAN),)
84+
TESTS_UBSAN = ubsan
85+
endif
8486
ifneq ($(HAVE_OPENMP),)
8587
TESTS_OMP = hello-omp
8688
endif

0 commit comments

Comments
 (0)