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

Fix qmltestrunner executable location and name

Browse Source 
As qmltestrunner is not any longer qt tool.
Adjust the executable name and add the way to find
it outside the qtdeclarative.

Reflects the change in:
https://codereview.qt-project.org/c/qt/qtdeclarative/+/642618

Task-number: COIN-1211
Change-Id: I628de79f09cc27fb4d4fc43f297fcfb0c808ee19
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Michal Klocek 2025-04-30 12:53:50 +02:00
parent 80c73dc38b
commit 9edcc46906
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/QtTestHelpers.cmake
View File

@ -753,8 +753,23 @@ function(qt_internal_add_test name)
endif()
else()
if(arg_QMLTEST AND NOT arg_SOURCES)
if(TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::qmltestrunner)
# TODO: fallback to support qtr as 'tool', remove when changes in qtdeclarative are in
set(qmltestrunner_executable ${QT_CMAKE_EXPORT_NAMESPACE}::qmltestrunner)
elseif(TARGET qmltestrunner)
set(qmltestrunner_executable qmltestrunner)
else()
find_program(qmltestrunner_executable
NAMES qmltestrunner qmltestrunner.exe
PATHS "${QT6_INSTALL_PREFIX}/${QT6_INSTALL_LIBEXECS}"
NO_DEFAULT_PATH
)
if(NOT qmltestrunner_executable)
message(FATAL_ERROR "qmltestrunner not found.")
endif()
endif()
set(test_working_dir "${CMAKE_CURRENT_SOURCE_DIR}")
set(test_executable ${QT_CMAKE_EXPORT_NAMESPACE}::qmltestrunner)
set(test_executable "${qmltestrunner_executable}")
else()
if (arg_WORKING_DIRECTORY)
set(test_working_dir "${arg_WORKING_DIRECTORY}")