From 5e3f73a650298961fcb854e6ef85c5bacccf1c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 18 Jul 2026 09:43:48 +0300 Subject: [PATCH] run-tests: Temporarily compile all executables before running them When building throwcatch-main.exe, we link with "-L.". Since we copy in the runtime libraries for executing tests, we might have libc++.dll present if we aim for the target "test" while compiling. For arm64x builds, we could end up trying to link directly against the arm64x libc++.dll rather than with the import library. Linking directly against an arm64x DLL doesn't work yet in 23.1.0-rc1, so avoid hitting this situation for now. This is a temporary workaround; linking against an arm64x DLL should work too, and the fix is being backported to the next RC. --- run-tests.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index abf9994..882b997 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -262,7 +262,10 @@ for arch in $ARCHS; do mkdir -p $TEST_DIR cd $TEST_DIR $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 + $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 $COPYARG $MAKEOPTS -j$CORES all + if [ "$TARGET" != "all" ]; then + $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 + fi cd .. done echo All tests succeeded