diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-07-31 12:06:54 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-09-12 09:38:51 +0000 |
| commit | 46041bf79f6a321cfc451c1d8055be7e19d69c4f (patch) | |
| tree | 2f2f51da7178ac922ea59e31c4d03b40051ba625 | |
| parent | f477802046983bac0ead9d964295c2227ea1effc (diff) | |
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 <alexey.edelev@qt.io>
(cherry picked from commit 2e96d4eefa842b382dfe0ace628e61aea7597d64)
| -rw-r--r-- | coin/platform_configs/linux_android_tests_multi_abi.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
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' ] |