diff options
author | Mikolaj Boc <mikolaj.boc@qt.io> | 2023-01-03 14:42:33 +0100 |
---|---|---|
committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2023-01-23 15:23:10 +0100 |
commit | 11891ae9c9fcf7cb911648675eca83f3189ccbed (patch) | |
tree | bacdebb4d98ac5289527beb98ce57349a5c1a4f3 /cmake/QtTargetHelpers.cmake | |
parent | 69e478480a782a663b8dd176ca4d917a09c91341 (diff) |
Skip tests outside of qtbase on batching+superbuild
The batcher does not currently work properly with non-qtbase
submodules. Disable them temporarily so that at least the
tests in qtbase are batched. Do this from qtbase so that changes
to each and every submodule are not necessary.
Also, maintain a list of tests that were thus skipped. On any
qt cmake internal function call that refers to such a target,
identify the target as skipped and make the call a no-op.
Fixes: QTBUG-109785
Change-Id: Ib0aa5d39eee8315ffd4ac62f6d1f44fe9bbf7a2f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtTargetHelpers.cmake')
-rw-r--r-- | cmake/QtTargetHelpers.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index 4bb187a44e..183baa8da4 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -20,6 +20,10 @@ function(qt_internal_extend_target target) if(NOT TARGET "${target}") message(FATAL_ERROR "${target} is not a target.") endif() + qt_internal_is_skipped_test(skipped ${target}) + if(skipped) + return() + endif() qt_internal_is_in_test_batch(in_batch ${target}) if(in_batch) _qt_internal_test_batch_target_name(target) @@ -1075,6 +1079,10 @@ function(qt_internal_undefine_global_definition target) if(NOT TARGET "${target}") message(FATAL_ERROR "${target} is not a target.") endif() + qt_internal_is_skipped_test(skipped ${target}) + if(skipped) + return() + endif() qt_internal_is_in_test_batch(in_batch ${target}) if(in_batch) _qt_internal_test_batch_target_name(target) |