diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-12-09 19:15:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-11 13:17:19 +0000 |
| commit | 591da3980542163fc7b0bce2665787296a87d776 (patch) | |
| tree | 3e5deac6ba513801b73a3013fdae3d22097b6c72 /coin | |
| parent | 5bfc0e1843687053ad3656700906e9304e8434fa (diff) | |
Android: restart emulator if it gets stuck during testing
Task-number: QTQAINFRA-4052
Change-Id: Ie1a0d1c6b6c5cd0425b7ccf195ac57408142f3c3
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 86a655387c26cd25dde69cebd18b5ff9379fbe3e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/coin_module_test_android_start_emulator.yaml | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/coin/instructions/coin_module_test_android_start_emulator.yaml b/coin/instructions/coin_module_test_android_start_emulator.yaml index fc5f259043..7fc034117c 100644 --- a/coin/instructions/coin_module_test_android_start_emulator.yaml +++ b/coin/instructions/coin_module_test_android_start_emulator.yaml @@ -3,21 +3,10 @@ instructions: - type: Group instructions: - type: ExecuteCommand - command: ["{{.Env.ANDROID_SDK_HOME}}/tools/emulator", "@x86emulator","-no-audio","-no-window","-gpu","swiftshader_indirect","-partition-size","4000"] - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 600 - userMessageOnFailure: "Failed to run emulator, check logs." - startInBackground: True - - type: ExecuteCommand - command: ["{{.Env.ANDROID_SDK_HOME}}/platform-tools/adb","devices"] - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 600 - userMessageOnFailure: "Failed to run adb, check logs." - - type: ExecuteCommand - command: ["{{.Env.ANDROID_SDK_HOME}}/platform-tools/adb","wait-for-device"] - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 1800 - userMessageOnFailure: "Failed to run adb, check logs." + command: "sh {{.SourceDir}}/util/android/android_emulator_launcher.sh" + maxTimeInSeconds: 300 + maxTimeBetweenOutput: 300 + userMessageOnFailure: "Failed to start emulator, check logs." enable_if: condition: property property: features |