Skip to content

Commit 8a82c24

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 db55d54 commit 8a82c24

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
@@ -220,6 +220,7 @@ for arch in $ARCHS; do
220220
mkdir -p $TEST_DIR
221221
cd $TEST_DIR
222222
$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
223+
$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
223224
$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
224225
cd ..
225226
done

test/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,6 @@ LOCAL_RUNTIMES = $(patsubst $(RUNTIMES_SRC)/%, %, $(wildcard $(addprefix $(RUNTI
262262
$(LOCAL_RUNTIMES): %$(DLLEXT): $(RUNTIMES_SRC)/%$(DLLEXT)
263263
cp -a $< $@
264264
$(COPY_TARGET)
265-
266-
all: $(LOCAL_RUNTIMES)
267265
endif
268266

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

0 commit comments

Comments
 (0)