diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-02-09 17:30:21 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-03-15 21:31:52 +0200 |
| commit | f9ef0b811bf52c1d1a8111eaa586e61dcb583e05 (patch) | |
| tree | 7faedbc4cd222fddebd3dcc65419257adfb64228 | |
| parent | 4534f8f953d4816dcdec71da0e9a45da2abc5ef5 (diff) | |
Add Android tests to Qt modules - part 1
This enables testing for Android for the modules:
qtdeclarative, qtsvg, qtshadertools, qtimageformats.
Also replace the qtbase Android test target with
linux_android_tests.yaml.
Task-number: QTBUG-88846
Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 523eb8e1ea20a2bb8cecc3bea5b62a9ba028cacb)
| -rw-r--r-- | coin/platform_configs/linux_android_tests.yaml | 16 | ||||
| -rw-r--r-- | coin/platform_configs/qtbase.yaml | 21 | ||||
| -rw-r--r-- | coin/platform_configs/qtdeclarative.yaml | 3 | ||||
| -rw-r--r-- | coin/platform_configs/qtimageformats.yaml | 3 | ||||
| -rw-r--r-- | coin/platform_configs/qtshadertools.yaml | 3 | ||||
| -rw-r--r-- | coin/platform_configs/qtsvg.yaml | 3 |
6 files changed, 27 insertions, 22 deletions
diff --git a/coin/platform_configs/linux_android_tests.yaml b/coin/platform_configs/linux_android_tests.yaml new file mode 100644 index 00000000..a8d9602c --- /dev/null +++ b/coin/platform_configs/linux_android_tests.yaml @@ -0,0 +1,16 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-RHEL-8.4-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'RHEL-8.4-host' + Features: ['Packaging', 'Sccache', 'AndroidTestRun'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', + 'CONAN_INSTALL_DIR={{.InstallDir}}/target', + 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', + 'ANDROID_EMULATOR=@emulator_x86_api_23'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 2079c5da..65a6b67d 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -4,22 +4,7 @@ Include: [ cmake_platforms_static_tests.yaml, macos-developer-build-tests.yaml, integrity.yaml, - ios-tests.yaml + ios-tests.yaml, + linux_android_tests.yaml ] -Configurations: -- - Template: 'qtci-linux-RHEL-8.4-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_INSTALL_DIR={{.InstallDir}}/target', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', - 'ANDROID_EMULATOR=@emulator_x86_api_23'] - - +Configurations: [] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index eab4a9a2..b0dfe61b 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,6 +3,7 @@ Include: [ cmake_platforms.yaml, macos-developer-build-tests.yaml, cmake_platforms_static_tests.yaml, - integrity.yaml + integrity.yaml, + linux_android_tests.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 82ab0218..5d531862 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + linux_android_tests.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index 82ab0218..5d531862 100644 --- a/coin/platform_configs/qtshadertools.yaml +++ b/coin/platform_configs/qtshadertools.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + linux_android_tests.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 82ab0218..5d531862 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + linux_android_tests.yaml ] Configurations: [] |