diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-15 17:03:38 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-07 06:33:47 +0000 |
| commit | 37801c6c537ef8e79094b405e64481a0246330a0 (patch) | |
| tree | d6f846a3359a4976a70df6ed77f154274df35c0c /qt_cmdline.cmake | |
| parent | c197629f8035023353c2ab678a46e212477f1536 (diff) | |
CMake: Build minimal subset of tests in desktop static builds
Add new configure option -make minimal-static-tests and CMake option
QT_BUILD_MINIMAL_STATIC_TESTS. In conjunction with QT_BUILD_TESTS
it will enable building a minimal subset of tests when targeting
a static desktop Qt build.
In qtbase the minimal subset includes all the auto tests of testlib,
tools, corelib and cmake. In particular this will also do cmake build
tests and qmake build tests (tst_qmake)
Adjust CI instructions to enable building a minimal subset of static
tests when a platform configuration is tagged with the
MinimalStaticTests feature.
Fix and skip a few tests that were failing.
Task-number: QTBUG-87580
Task-number: QTBUG-91869
Change-Id: I1fc311b8d5e743ccf05047fb9a7fdb813a645206
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 0e6c4224f00999d4089d7c2ac462bb5a60a14adc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'qt_cmdline.cmake')
| -rw-r--r-- | qt_cmdline.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 10cc67d7ec..d08445692d 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -73,13 +73,14 @@ qt_commandline_option(linker TYPE optionalString VALUES bfd gold lld) qt_commandline_option(ltcg TYPE boolean) # special case begin qt_commandline_option(make TYPE addString VALUES examples libs tests tools - benchmarks) + benchmarks manual-tests minimal-static-tests) # special case end qt_commandline_option(make-tool TYPE string) qt_commandline_option(mips_dsp TYPE boolean) qt_commandline_option(mips_dspr2 TYPE boolean) qt_commandline_option(mp TYPE boolean NAME msvc_mp) -qt_commandline_option(nomake TYPE addString VALUES examples tests tools benchmarks) # special case +qt_commandline_option(nomake TYPE addString VALUES examples tests tools benchmarks + manual-tests minimal-static-tests) # special case qt_commandline_option(opensource TYPE void NAME commercial VALUE no) qt_commandline_option(optimize-debug TYPE boolean NAME optimize_debug) qt_commandline_option(optimize-size TYPE boolean NAME optimize_size) |