AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make manual tests use the usual wasm_shell.html

Browse Source 
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 <morten.sorvig@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Mikolaj Boc 2023-03-06 10:57:16 +01:00
parent 9273bcac7f
commit c6183cfc7b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtTestHelpers.cmake
View File

@ -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)

3
src/corelib/Qt6WasmMacros.cmake
View File

@ -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)