test: Simplify handling of OpenMP

It is available on all architectures by default now. Keep the
HAVE_OPENMP conditional within the test makefile to allow custom
testing without having it available.
This commit is contained in:
Martin Storsjö committed 2023-01-29 01:09:17 +02:00
1 parent 6b8725333a
commit dfd4c31f2e
2 files changed
+5 -6

No files matched your search

+2 -6
View File
@@ -100,28 +100,24 @@ for arch in $ARCHS; do
COPY="$COPY_I686"
NATIVE="$NATIVE_X86"
HAVE_SANITIZERS=1
HAVE_OPENMP=1
;;
x86_64)
RUN="$RUN_X86_64"
COPY="$COPY_X86_64"
NATIVE="$NATIVE_X86"
HAVE_SANITIZERS=1
HAVE_OPENMP=1
;;
armv7)
RUN="$RUN_ARMV7"
COPY="$COPY_ARMV7"
NATIVE="$NATIVE_ARMV7"
unset HAVE_SANITIZERS
HAVE_OPENMP=1
;;
aarch64)
RUN="$RUN_AARCH64"
COPY="$COPY_AARCH64"
NATIVE="$NATIVE_AARCH64"
unset HAVE_SANITIZERS
HAVE_OPENMP=1
;;
esac
@@ -141,8 +137,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_SANITIZERS=$HAVE_SANITIZERS 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_SANITIZERS=$HAVE_SANITIZERS HAVE_OPENMP=$HAVE_OPENMP 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_SANITIZERS=$HAVE_SANITIZERS NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin clean
$MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_SANITIZERS=$HAVE_SANITIZERS NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin RUN="$RUN" $COPYARG $MAKEOPTS -j$CORES $TARGET
cd ..
done
echo All tests succeeded
+3
View File
@@ -58,6 +58,9 @@ endif
EXEEXT = .exe
DLLEXT = .dll
# Available everywhere by default, but can be skipped by passing HAVE_OPENMP=
HAVE_OPENMP = 1
TESTS_C = hello hello-tls crt-test setjmp
TESTS_C_DLL = autoimport-lib
TESTS_C_LINK_DLL = autoimport-main