From 00ef435571db772c9d66e7666cbbb2cce85f2521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Tue, 13 Aug 2024 10:43:21 +0200 Subject: [PATCH] wasm: Don't hardcode ASYNCIFY 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Build for the "default" config only, which can be asyncyfy 0,1, or 2 depending on Qt build configuration. Change-Id: I29d9a11b30325491151fc4e621272e5390681fa7 Reviewed-by: Jøger Hansegård Reviewed-by: Lorn Potter --- .../eventloop/eventloop_auto/CMakeLists.txt | 21 ------------------- .../eventloop_auto_asyncify.html | 10 --------- tests/manual/wasm/qstdweb/CMakeLists.txt | 4 ---- 3 files changed, 35 deletions(-) delete mode 100644 tests/manual/wasm/eventloop/eventloop_auto/eventloop_auto_asyncify.html diff --git a/tests/manual/wasm/eventloop/eventloop_auto/CMakeLists.txt b/tests/manual/wasm/eventloop/eventloop_auto/CMakeLists.txt index 88ddfac4c82..cd657ecdc3d 100644 --- a/tests/manual/wasm/eventloop/eventloop_auto/CMakeLists.txt +++ b/tests/manual/wasm/eventloop/eventloop_auto/CMakeLists.txt @@ -2,7 +2,6 @@ # SPDX-License-Identifier: BSD-3-Clause include_directories(../../qtwasmtestlib/) -# default buid qt_internal_add_manual_test(eventloop_auto SOURCES main.cpp @@ -23,23 +22,3 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../../qtwasmtestlib/qtwasmtestlib.js ${CMAKE_CURRENT_BINARY_DIR}/qtwasmtestlib.js) - -# asyncify enabled build -qt_internal_add_manual_test(eventloop_auto_asyncify - SOURCES - main.cpp - ../../qtwasmtestlib/qtwasmtestlib.cpp - LIBRARIES - Qt::Core - Qt::CorePrivate -) - -target_link_options(eventloop_auto_asyncify PRIVATE -sASYNCIFY -Os) - -add_custom_command( - TARGET eventloop_auto_asyncify POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/eventloop_auto_asyncify.html - ${CMAKE_CURRENT_BINARY_DIR}/eventloop_auto_asyncify.html) - - diff --git a/tests/manual/wasm/eventloop/eventloop_auto/eventloop_auto_asyncify.html b/tests/manual/wasm/eventloop/eventloop_auto/eventloop_auto_asyncify.html deleted file mode 100644 index f09b29d85ba..00000000000 --- a/tests/manual/wasm/eventloop/eventloop_auto/eventloop_auto_asyncify.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - -

Running event dispatcher auto test.

-
diff --git a/tests/manual/wasm/qstdweb/CMakeLists.txt b/tests/manual/wasm/qstdweb/CMakeLists.txt index 39039c39104..8904abc94b2 100644 --- a/tests/manual/wasm/qstdweb/CMakeLists.txt +++ b/tests/manual/wasm/qstdweb/CMakeLists.txt @@ -71,8 +71,6 @@ add_custom_command( ${CMAKE_CURRENT_SOURCE_DIR}/../qtwasmtestlib/qtwasmtestlib.js ${CMAKE_CURRENT_BINARY_DIR}/qtwasmtestlib.js) -target_link_options(qwasmcompositor_auto PRIVATE -sASYNCIFY -Os) - qt_internal_add_manual_test(iodevices_auto SOURCES iodevices_main.cpp @@ -94,5 +92,3 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../qtwasmtestlib/qtwasmtestlib.js ${CMAKE_CURRENT_BINARY_DIR}/qtwasmtestlib.js) - -target_link_options(iodevices_auto PRIVATE -sASYNCIFY -Os)