Skip to content

Commit 094b9e6

Browse files
committed
test: Copy all DLLs strictly after compiling
If libunwind.dll is copied before linking, linking will find libunwind.dll sooner than libunwind.dll.a. The latter contains "#_Unwind_Resume", while the DLL doesn't contain such a symbol.
1 parent ae6c7c3 commit 094b9e6

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

run-tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ for arch in $ARCHS; do
227227
mkdir -p $TEST_DIR
228228
cd $TEST_DIR
229229
$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
230231
$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
231232
cd ..
232233
done

test/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@ LOCAL_RUNTIMES = $(patsubst $(RUNTIMES_SRC)/%, %, $(wildcard $(addprefix $(RUNTI
264264
$(LOCAL_RUNTIMES): %$(DLLEXT): $(RUNTIMES_SRC)/%$(DLLEXT)
265265
cp -a $< $@
266266
$(COPY_TARGET)
267-
268-
all: $(LOCAL_RUNTIMES)
269267
endif
270268

271269
TESTS = $(filter-out %$(DLLEXT), $(TARGETS))

0 commit comments

Comments
 (0)