1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Relay the batched test name to ctest commandline on all platforms

Browse Source 
Extend the support of pointing at the right test from batch from WASM
to all supported platforms.

Change-Id: I9b6342ed0954f0fdc2f08c76f6b3f24f44f0388a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Mikolaj Boc 2022-08-26 10:38:47 +02:00
parent c88d2b0fcd
commit ecbbb75585
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmake/QtTestHelpers.cmake
View File

@ -365,6 +365,17 @@ function(qt_internal_is_in_test_batch out name)
endif() endif()
endfunction() endfunction()
function(qt_internal_get_batched_test_argument out testname)
if(WASM)
# Add a query string to the runner document, so that the script therein
# knows which test to run in response to launching the testcase by ctest.
set(${out} "--batched_test=${testname}" PARENT_SCOPE)
else()
# Simply add the test name in case of standard executables.
set(${out} "${testname}" PARENT_SCOPE)
endif()
endfunction()
# This function creates a CMake test target with the specified name for use with CTest. # This function creates a CMake test target with the specified name for use with CTest.
# #
# All tests are wrapped with cmake script that supports TESTARGS and TESTRUNNER environment # All tests are wrapped with cmake script that supports TESTARGS and TESTRUNNER environment
@ -406,6 +417,7 @@ function(qt_internal_add_test name)
if(NOT arg_NO_BATCH AND QT_BUILD_TESTS_BATCHED AND NOT arg_QMLTEST) if(NOT arg_NO_BATCH AND QT_BUILD_TESTS_BATCHED AND NOT arg_QMLTEST)
qt_internal_add_test_to_batch(name ${name} ${ARGN}) qt_internal_add_test_to_batch(name ${name} ${ARGN})
set(setting_up_batched_test TRUE)
elseif(arg_SOURCES) elseif(arg_SOURCES)
if(QT_BUILD_TESTS_BATCHED AND arg_QMLTEST) if(QT_BUILD_TESTS_BATCHED AND arg_QMLTEST)
message(WARNING "QML tests won't be batched - unsupported (yet)") message(WARNING "QML tests won't be batched - unsupported (yet)")
@ -474,6 +486,7 @@ function(qt_internal_add_test name)
qt_internal_extend_target("${name}" CONDITION ANDROID qt_internal_extend_target("${name}" CONDITION ANDROID
LIBRARIES ${QT_CMAKE_EXPORT_NAMESPACE}::Gui LIBRARIES ${QT_CMAKE_EXPORT_NAMESPACE}::Gui
) )
set(setting_up_batched_test FALSE)
endif() endif()
foreach(path IN LISTS arg_QML_IMPORTPATH) foreach(path IN LISTS arg_QML_IMPORTPATH)
@ -505,8 +518,14 @@ function(qt_internal_add_test name)
set(test_working_dir "") set(test_working_dir "")
set(test_executable "${name}") set(test_executable "${name}")
elseif(WASM) elseif(WASM)
# Test script expects html file # The test script expects an html file. In case of batched tests, the
set(test_executable "${name}.html") # version specialized for running batches has to be supplied.
if(setting_up_batched_test)
get_target_property(batch_output_dir ${name} RUNTIME_OUTPUT_DIRECTORY)
set(test_executable "${batch_output_dir}/batchedtestrunner.html")
else()
set(test_executable "${name}.html")
endif()
if(QT6_INSTALL_PREFIX) if(QT6_INSTALL_PREFIX)
set(QT_WASM_TESTRUNNER "${QT6_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}/qt-wasmtestrunner.py") set(QT_WASM_TESTRUNNER "${QT6_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}/qt-wasmtestrunner.py")
@ -532,6 +551,11 @@ function(qt_internal_add_test name)
endif() endif()
endif() endif()
if(setting_up_batched_test)
qt_internal_get_batched_test_argument(batched_test_argument ${testname})
list(APPEND extra_test_args ${batched_test_argument})
endif()
qt_internal_collect_command_environment(test_env_path test_env_plugin_path) qt_internal_collect_command_environment(test_env_path test_env_plugin_path)
if(arg_NO_WRAPPER OR QT_NO_TEST_WRAPPERS) if(arg_NO_WRAPPER OR QT_NO_TEST_WRAPPERS)