aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2022-07-18 15:39:17 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-07-19 23:33:39 +0000
commit164913b5d976513716516af19acecc41a43852c5 (patch)
tree6c83da29d21b67e940e520c4fee52149d34f4287
parentf87f7ac4df1cca31fed1b5d926b77611683d1a06 (diff)
Coin:Android: Use VMSize8 for Android test targets
Ensure to explicitly use 8 cores for Android targets runnining tests to reduce the amount of flaky fails due to the emulator crashing or freezing. Task-number: COIN-896 Change-Id: I8b0cfac34aa7fc416166b9f7ae0b3e9d72c62e55 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 39efd3c35fd6713104d7cc2f47567010485cdae5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_linux.yaml2
-rw-r--r--coin/platform_configs/tqtc-android-automotive.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
index 06923f7f..dea0b437 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
@@ -35,7 +35,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
- Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
+ Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml
index e37dea06..b280c851 100644
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -51,7 +51,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
- Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize4', 'UseConfigure']
+ Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',