From 2e96d4eefa842b382dfe0ace628e61aea7597d64 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 31 Jul 2023 12:06:54 +0300 Subject: [PATCH] Android: Add missing ANDROID_EMULATOR param to Multi-ABI test target The Multi-ABI targets run a subset of Android tests but the target doesn't explicitly set the name of the Android emulator to run, so it was defaulting to Android 6 because the CI Android emulator runner script defaults to that. The latter is going change to be more explicit, so this needs to be explicit also. Pick-to: 6.6 6.5 Change-Id: Ifd5ddd5b5cf3b7a1b275f5a7b1252a21ae3165bc Reviewed-by: Alexey Edelev --- coin/platform_configs/linux_android_tests_multi_abi.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 9bd9a743..162625c8 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -23,7 +23,8 @@ Configurations: 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux', - 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"' + 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', + 'ANDROID_EMULATOR=emulator_x86_api_23' ] - Id: 'rhel_8.8_android_multi' @@ -48,5 +49,6 @@ Configurations: 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-RHEL-8.8-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-RHEL-8.8-x86_64-on-linux', - 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"' + 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', + 'ANDROID_EMULATOR=emulator_x86_api_23' ]