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-08 17:03:43 +0200 |
commit | 523eb8e1ea20a2bb8cecc3bea5b62a9ba028cacb (patch) | |
tree | 799feb496956f3d080e921a74f6b01e88484d6ef /coin/platform_configs/qtbase.yaml | |
parent | e5ecdd605e0bcd893df4c5c935238d67ae81823f (diff) |
Add Android tests to Qt modules - part 1
This enables testing for Android for the modules:
qtdeclarative, qtsvg, qtshadertools, qtimageformats, qtlanguageserver.
Also replace the qtbase Android test target with
linux_android_tests.yaml.
Task-number: QTBUG-88846
Pick-to: 6.3 6.2
Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/platform_configs/qtbase.yaml')
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 8ff467c6..65a6b67d 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -4,20 +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/ci-linux-x86_64-gcc', - 'CONAN_INSTALL_DIR={{.InstallDir}}/target', - 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang', - 'ANDROID_EMULATOR=@emulator_x86_api_23'] +Configurations: [] |