From 39da8bd4527f013b00d0c56ccb92a0e113612eeb Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 18 Jul 2022 15:39:17 +0300 Subject: [PATCH] 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 (cherry picked from commit 39efd3c35fd6713104d7cc2f47567010485cdae5) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_target_android_host_linux.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 2 +- 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 68c6fcb8..2cf2d305 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 cca17f76..d4a8136f 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}}',