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

Fixup: Add *_check build targets for auto cmake tests

Browse Source 
- `PARSE_ARGV` should have been 1.
- `module_includes` target needs to be unique
  See gerrit comment of previous change, and
https://gitlab.kitware.com/cmake/cmake/-/issues/26580

Amends: 8f2f4ad4688df4963982c489c80b84e115cda29d

Pick-to: 6.8 6.9
Task-number: QTBUG-98640
Change-Id: I82b85813f282ba1d5b4c938e59558e32647d4d86
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Cristian Le 2025-01-06 17:53:45 +01:00
parent 1fb369211e
commit 9f805b5bf7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPublicTestHelpers.cmake
View File

@ -131,7 +131,7 @@ function(_qt_internal_make_check_target testname)
set(singleOpts CTEST_TEST_NAME)
set(multiOpts "")
cmake_parse_arguments(PARSE_ARGV 0 arg
cmake_parse_arguments(PARSE_ARGV 1 arg
"${options}" "${singleOpts}" "${multiOpts}"
)
if(NOT arg_CTEST_TEST_NAME)

8
src/corelib/Qt6CTestMacros.cmake
View File

@ -828,5 +828,11 @@ function(_qt_internal_test_module_includes)
add_test(module_includes "${CMAKE_COMMAND}" "-P" "${wrapper_file}")
set_tests_properties(module_includes PROPERTIES
SKIP_REGULAR_EXPRESSION "${_qt_internal_skip_build_test_regex}")
_qt_internal_make_check_target(module_includes)
# We need a unique name for the targets
# TODO: CTest name clash would make multiple tests be run as long as they are
# defined in nested folders
string(TOLOWER "${PROJECT_NAME}" project_name_lower)
_qt_internal_make_check_target(${project_name_lower}_module_includes
CTEST_TEST_NAME module_includes
)
endfunction()