Skip non-qtbase tests on Coin
The previous attempt failed as target coin configuration doesn't use superbuild. Skip the tests based on the TESTED_MODULE_COIN environment variable Task-number: QTBUG-109786 Change-Id: I0dbe6ff64ca4a2e81fef377865ef4e99b58c5eb2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
494786ce73
commit
6c12ea1d45
@ -466,15 +466,22 @@ function(qt_internal_add_test name)
|
|||||||
)
|
)
|
||||||
_qt_internal_validate_all_args_are_parsed(arg)
|
_qt_internal_validate_all_args_are_parsed(arg)
|
||||||
|
|
||||||
if(QT_BUILD_TESTS_BATCHED AND QT_SUPERBUILD AND NOT arg_NO_BATCH AND NOT arg_QMLTEST)
|
if(QT_BUILD_TESTS_BATCHED AND NOT arg_NO_BATCH AND NOT arg_QMLTEST)
|
||||||
qt_internal_is_qtbase_test(is_qtbase_test)
|
if (QT_SUPERBUILD OR DEFINED ENV{TESTED_MODULE_COIN})
|
||||||
if(NOT is_qtbase_test)
|
set(is_qtbase_test FALSE)
|
||||||
file(GENERATE OUTPUT "dummy${name}.cpp" CONTENT "int main() { return 0; }")
|
if(QT_SUPERBUILD)
|
||||||
# Add a dummy target to tackle some potential problems
|
qt_internal_is_qtbase_test(is_qtbase_test)
|
||||||
qt_internal_add_executable(${name} SOURCES "dummy${name}.cpp")
|
elseif($ENV{TESTED_MODULE_COIN} STREQUAL "qtbase")
|
||||||
# Batched tests outside of qtbase are unsupported and skipped
|
set(is_qtbase_test TRUE)
|
||||||
qt_internal_set_skipped_test(${name})
|
endif()
|
||||||
return()
|
if(NOT is_qtbase_test)
|
||||||
|
file(GENERATE OUTPUT "dummy${name}.cpp" CONTENT "int main() { return 0; }")
|
||||||
|
# Add a dummy target to tackle some potential problems
|
||||||
|
qt_internal_add_executable(${name} SOURCES "dummy${name}.cpp")
|
||||||
|
# Batched tests outside of qtbase are unsupported and skipped
|
||||||
|
qt_internal_set_skipped_test(${name})
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user