run-tests: Merge TESTS_CPP_LOAD_DLL back into TESTS_CPP

This was split in 591a5c2ddc since
we couldn't/shouldn't test these for UWP targets.

When the testing for UWP targets was reduced in
551b046498, there was no longer any
distinction between TESTS_CPP_LOAD_DLL and TESTS_CPP, so merge
them back.
This commit is contained in:
Martin Storsjö committed 2022-10-27 00:40:06 +03:00
1 parent c541aa87b8
commit 64dffd28a5
1 file changed
+1 -6
+1 -6
View File
@@ -84,8 +84,7 @@ TESTS_C_DLL="autoimport-lib"
TESTS_C_LINK_DLL="autoimport-main"
TESTS_C_NO_BUILTIN="crt-test"
TESTS_C_ANSI_STDIO="crt-test"
TESTS_CPP="hello-cpp global-terminate longjmp-cleanup"
TESTS_CPP_LOAD_DLL="tlstest-main"
TESTS_CPP="hello-cpp global-terminate tlstest-main longjmp-cleanup"
TESTS_CPP_EXCEPTIONS="hello-exception exception-locale exception-reduced"
TESTS_CPP_STATIC="hello-exception"
TESTS_CPP_DLL="tlstest-lib throwcatch-lib"
@@ -175,10 +174,6 @@ for arch in $ARCHS; do
$arch-w64-mingw32-clang++ $test.cpp -static -o $TEST_DIR/$test-static.exe
TESTS_EXTRA="$TESTS_EXTRA $test-static"
done
for test in $TESTS_CPP_LOAD_DLL; do
$arch-w64-mingw32-clang++ $test.cpp -o $TEST_DIR/$test.exe
TESTS_EXTRA="$TESTS_EXTRA $test"
done
for test in $TESTS_CPP_DLL; do
$arch-w64-mingw32-clang++ $test.cpp -shared -o $TEST_DIR/$test.dll -Wl,--out-implib,$TEST_DIR/lib$test.dll.a
done