diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2022-04-22 10:29:21 +0200 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2022-05-23 22:29:13 +0200 |
| commit | a7b7ee295ddc26b3d7450e696dec1b24653b73cc (patch) | |
| tree | 0297d2e6f8a1bd90d2c199d64a299fd3d1fd816b | |
| parent | 5dec389f043ecf80e661880b911d19df597e21d1 (diff) | |
Activate testing of developer build for Android in qtdeclarative
Fixes: QTBUG-101865
Fixes: QTBUG-102943
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit fb2ad5889ed1049a617798170d75049d7fcbe129)
Change-Id: I4bf94330c42e3188321e659c3dc9ede2e4ed3c7b
| -rw-r--r-- | coin/platform_configs/linux_android_tests_developer.yaml | 16 | ||||
| -rw-r--r-- | coin/platform_configs/qtdeclarative.yaml | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml new file mode 100644 index 00000000..d5f54348 --- /dev/null +++ b/coin/platform_configs/linux_android_tests_developer.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 -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=Debug -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/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index bf3d33e7..9ae28988 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,6 +3,7 @@ Include: [ cmake_platforms.yaml, integrity.yaml, cmake_platforms_static_tests.yaml, - linux_android_tests.yaml + linux_android_tests.yaml, + linux_android_tests_developer.yaml ] Configurations: [] |