diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-15 17:02:47 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-05 10:48:03 +0200 |
commit | 7729149c97210e139f1f8c05a4a3c4c95d984ede (patch) | |
tree | 244d861230b3178d008a753c2a90a298af509573 | |
parent | ad5af7931aab7da043c1cd8ddee0de19f9b727f4 (diff) |
Build minimal subset of tests in desktop static builds
New cmake_platforms_static_tests.yaml file will be included in repos
that support building and running a minimal subset of tests built
against a static Qt.
Currently it's limited to qtbase.
Added macOS, Linux-SLES and Windows static configs.
Skipped specifying the PostgreSQL lib path for Windows and macOS because
the plugin gets automatically linked into tst_moc, but the test build
phase doesn't actually call find_package for PostgreSQL and the build
system generation fails.
Similary skipped specifying the openssl lib location for macOS,
because the module_includes cmake auto test fails to find the
WrapOpenSSLHeaders package.
Explicitly tag iOS static config with DisableTests. The instructions
already skipped building tests for iOS, but it's better to be explicit
and update the instructions not to do that anymore.
Task-number: QTBUG-87580
Change-Id: I0d38a0ad055c92646609202691aeb8db29689f5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit bead5e87205be48774f5cec6b021f0c470ee40e6)
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_static_tests.yaml | 28 | ||||
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 1 |
3 files changed, 30 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 68061c59..95d59623 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -99,7 +99,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] - Id: 'Windows10-Mingw8-x64-host' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml new file mode 100644 index 00000000..df01c8ee --- /dev/null +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -0,0 +1,28 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-SLES-15_SP2-x86_64-50' + Compiler: 'GCC' + Features: ['Sccache', 'MinimalStaticTests'] + Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-windows-10-x86_64-52' + Compiler: 'MSVC2019' + Features: ['Sccache', 'MinimalStaticTests'] + Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Environment variables: [ + 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' + ] +- + Template: 'qtci-macos-11.0-x86_64-102' + Compiler: 'Clang' + Features: ['Sccache', 'MinimalStaticTests'] + Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Environment variables: [ + 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + ] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 1493629a..a65e1690 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, + cmake_platforms_static_tests.yaml, macos-developer-build-tests.yaml ] Configurations: |