test: Skip building the ubsan and openmp tests for arm64ec
Also unset RUN for arm64ec, instead of accidentally inheriting the earlier value.
This commit is contained in:
1 parent
cb92de78e7
commit
4700b4f7bb
2 files changed
+12
-3
No files matched your search
+9
-2
@@ -174,6 +174,8 @@ fi
|
|||||||
|
|
||||||
for arch in $ARCHS; do
|
for arch in $ARCHS; do
|
||||||
unset HAVE_ASAN
|
unset HAVE_ASAN
|
||||||
|
HAVE_UBSAN=1
|
||||||
|
HAVE_OPENMP=1
|
||||||
case $arch in
|
case $arch in
|
||||||
i686)
|
i686)
|
||||||
RUN="$RUN_I686"
|
RUN="$RUN_I686"
|
||||||
@@ -201,6 +203,11 @@ for arch in $ARCHS; do
|
|||||||
COPY="$COPY_AARCH64"
|
COPY="$COPY_AARCH64"
|
||||||
NATIVE="$NATIVE_AARCH64"
|
NATIVE="$NATIVE_AARCH64"
|
||||||
;;
|
;;
|
||||||
|
arm64ec)
|
||||||
|
unset HAVE_UBSAN
|
||||||
|
unset HAVE_OPENMP
|
||||||
|
unset RUN
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
TARGET=all
|
TARGET=all
|
||||||
@@ -219,8 +226,8 @@ for arch in $ARCHS; do
|
|||||||
[ -z "$CLEAN" ] || rm -rf $TEST_DIR
|
[ -z "$CLEAN" ] || rm -rf $TEST_DIR
|
||||||
mkdir -p $TEST_DIR
|
mkdir -p $TEST_DIR
|
||||||
cd $TEST_DIR
|
cd $TEST_DIR
|
||||||
$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
|
$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
|
||||||
$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
|
$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
|
||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
echo All tests succeeded
|
echo All tests succeeded
|
||||||
+3
-1
@@ -80,7 +80,9 @@ TESTS_FORTIFY = bufferoverflow crt-test
|
|||||||
ifneq ($(HAVE_ASAN),)
|
ifneq ($(HAVE_ASAN),)
|
||||||
TESTS_ASAN = stacksmash
|
TESTS_ASAN = stacksmash
|
||||||
endif
|
endif
|
||||||
TESTS_UBSAN = ubsan
|
ifneq ($(HAVE_UBSAN),)
|
||||||
|
TESTS_UBSAN = ubsan
|
||||||
|
endif
|
||||||
ifneq ($(HAVE_OPENMP),)
|
ifneq ($(HAVE_OPENMP),)
|
||||||
TESTS_OMP = hello-omp
|
TESTS_OMP = hello-omp
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in new issue
Block a user