From 4700b4f7bb3b3652b319532771ec221814bacf15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 26 Mar 2025 22:54:04 +0200
Subject: [PATCH] test: Skip building the ubsan and openmp tests for arm64ec

Also unset RUN for arm64ec, instead of accidentally inheriting the
earlier value.
---
 run-tests.sh  | 11 +++++++++--
 test/Makefile |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/run-tests.sh b/run-tests.sh
index a147930..3b79914 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -174,6 +174,8 @@ fi
 
 for arch in $ARCHS; do
     unset HAVE_ASAN
+    HAVE_UBSAN=1
+    HAVE_OPENMP=1
     case $arch in
     i686)
         RUN="$RUN_I686"
@@ -201,6 +203,11 @@ for arch in $ARCHS; do
         COPY="$COPY_AARCH64"
         NATIVE="$NATIVE_AARCH64"
         ;;
+    arm64ec)
+        unset HAVE_UBSAN
+        unset HAVE_OPENMP
+        unset RUN
+        ;;
     esac
 
     TARGET=all
@@ -219,8 +226,8 @@ for arch in $ARCHS; do
     [ -z "$CLEAN" ] || rm -rf $TEST_DIR
     mkdir -p $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 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 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 RUN="$RUN" $COPYARG $MAKEOPTS -j$CORES $TARGET
     cd ..
 done
 echo All tests succeeded
diff --git a/test/Makefile b/test/Makefile
index a23c81a..f493506 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -80,7 +80,9 @@ TESTS_FORTIFY = bufferoverflow crt-test
 ifneq ($(HAVE_ASAN),)
     TESTS_ASAN = stacksmash
 endif
-TESTS_UBSAN = ubsan
+ifneq ($(HAVE_UBSAN),)
+    TESTS_UBSAN = ubsan
+endif
 ifneq ($(HAVE_OPENMP),)
     TESTS_OMP = hello-omp
 endif