From c6183cfc7b971160b293d7f619bb41045837c0e6 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Mon, 6 Mar 2023 10:57:16 +0100 Subject: [PATCH] Make manual tests use the usual wasm_shell.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manual tests are supposed to display UI and be assessed manually, but currently they use the auto test runner by mistake. Use the normal wasm shell to fix this and make them work like usual applications. Fixes: QTBUG-111753 Change-Id: I9d3c0ad56e913b73737c5b72087e82980989d8b8 Reviewed-by: Morten Johan Sørvig Reviewed-by: Alexandru Croitor --- cmake/QtTestHelpers.cmake | 2 ++ src/corelib/Qt6WasmMacros.cmake | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 20315aba5c3..bab6406a874 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -268,6 +268,7 @@ function(qt_internal_add_test_to_batch batch_name name) set_property(TARGET ${target} PROPERTY _qt_has_lowdpi ${arg_LOWDPI}) set_property(TARGET ${target} PROPERTY _qt_version ${version_arg}) set_property(TARGET ${target} PROPERTY _qt_is_test_executable TRUE) + set_property(TARGET ${target} PROPERTY _qt_is_manual_test ${arg_MANUAL}) else() # Check whether the args match with the batch. Some differences between # flags cannot be reconciled - one should not combine these tests into @@ -543,6 +544,7 @@ function(qt_internal_add_test name) ) set(setting_up_batched_test FALSE) set_target_properties(${name} PROPERTIES _qt_is_test_executable TRUE) + set_target_properties(${name} PROPERTIES _qt_is_manual_test ${arg_MANUAL}) endif() foreach(path IN LISTS arg_QML_IMPORTPATH) diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake index 8274a4216e3..5cb8b73a8ea 100644 --- a/src/corelib/Qt6WasmMacros.cmake +++ b/src/corelib/Qt6WasmMacros.cmake @@ -26,7 +26,8 @@ function(_qt_internal_wasm_add_target_helpers target) get_target_property(target_output_directory ${target} RUNTIME_OUTPUT_DIRECTORY) get_target_property(is_test ${target} _qt_is_test_executable) - if(is_test) + get_target_property(is_manual_test ${target} _qt_is_manual_test) + if(is_test AND NOT is_manual_test) # Keep in sync with testrunner_files in testlib/CMakeLists.txt configure_file("${WASM_BUILD_DIR}/libexec/batchedtestrunner.html" "${target_output_directory}/${_target_output_name}.html" COPYONLY)