From 64dffd28a5bf0c07792b149552642503ba2e212c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 26 Oct 2022 14:22:11 +0300 Subject: [PATCH] run-tests: Merge TESTS_CPP_LOAD_DLL back into TESTS_CPP This was split in 591a5c2ddc0a8f6aae83816b538afbbd224f26a0 since we couldn't/shouldn't test these for UWP targets. When the testing for UWP targets was reduced in 551b04649871bacb686228254ee2ff051ea0bd6e, there was no longer any distinction between TESTS_CPP_LOAD_DLL and TESTS_CPP, so merge them back. --- run-tests.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/run-tests.sh b/run-tests.sh index b98d4a2..416d41c 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -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