diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2022-02-18 12:13:56 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-11 07:44:25 +0000 |
| commit | 9030252a5b8745a9d5c61d873e32cedec038755d (patch) | |
| tree | 0857ecff124370951a9cea14e75c3af47255038f | |
| parent | 48216ce49646fa2f8beb1a80624846f3826dd588 (diff) | |
Add several autotest cases to Minimal set for STATIC build
- It is not possible to build all autotests for STATIC build, because
CI doesn't have enough resources.
But it is possible to build a few tests on CI for INTEGRITY testing.
Task-number: QTBUG-99123
Change-Id: I698edb9cd0696dd55e1b82547cb57c34b993bb10
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 09cb6a4952d17925c8389216c16605eb68ab3418)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/qml/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/quick/CMakeLists.txt | 7 |
3 files changed, 17 insertions, 3 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 3ef1b6e735..0962fccb1b 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,13 +1,16 @@ add_subdirectory(cmake) +if(TARGET Qt::Quick) + add_subdirectory(qml) + add_subdirectory(quick) +endif() + # Limit set of tests to run for static Qt builds. if(QT_BUILD_MINIMAL_STATIC_TESTS) return() endif() if(TARGET Qt::Quick) - add_subdirectory(qml) - add_subdirectory(quick) add_subdirectory(quicktest) endif() if(TARGET Qt::QuickTest) diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index fd587e93a6..f694f3e267 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -12,6 +12,12 @@ add_subdirectory(qjsvalueiterator) add_subdirectory(qjsonbinding) add_subdirectory(qqmlfile) add_subdirectory(qqmlfileselector) + +# Limit set of tests to run for static Qt builds. +if(QT_BUILD_MINIMAL_STATIC_TESTS) + return() +endif() + add_subdirectory(qqmlcomponent) add_subdirectory(qqmlconsole) add_subdirectory(qqmlengine) diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt index de701f909d..0eed29a685 100644 --- a/tests/auto/quick/CMakeLists.txt +++ b/tests/auto/quick/CMakeLists.txt @@ -2,9 +2,14 @@ add_subdirectory(geometry) add_subdirectory(nodes) -add_subdirectory(drawingmodes) add_subdirectory(qquickpixmapcache) +# Limit set of tests to run for static Qt builds. +if(QT_BUILD_MINIMAL_STATIC_TESTS) + return() +endif() +add_subdirectory(drawingmodes) + if(QT_FEATURE_private_tests) add_subdirectory(examples) add_subdirectory(nokeywords) |