From 46041bf79f6a321cfc451c1d8055be7e19d69c4f 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. Change-Id: Ifd5ddd5b5cf3b7a1b275f5a7b1252a21ae3165bc Reviewed-by: Alexey Edelev (cherry picked from commit 2e96d4eefa842b382dfe0ace628e61aea7597d64) --- coin/platform_configs/linux_android_tests_multi_abi.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 37db729a..6edbed25 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -22,5 +22,6 @@ Configurations: 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.4', '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' ]