summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2021-02-18 17:12:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-19 12:08:12 +0000
commit57dad64fe9ba908ae146c316f57e9a6c27a0d61b (patch)
treea3e6e103ea2f6bd98436a266d1a41ef430fa1b35
parent88cb10c41ce7c6a00487e9f3b1993dcf9aecd640 (diff)
Coin: fix android emulator script to use bash instead of sh
Task-number: QTBUG-91180 Change-Id: I410c6769aac3b3b760ff35aa71d52c8a5d6c1143 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 136324ad623c09f47061b8c47deac90111904f57) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/instructions/coin_module_test_android_start_emulator.yaml2
-rwxr-xr-xutil/android/android_emulator_launcher.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/instructions/coin_module_test_android_start_emulator.yaml b/coin/instructions/coin_module_test_android_start_emulator.yaml
index 57023b3a1f..448a9ca9af 100644
--- a/coin/instructions/coin_module_test_android_start_emulator.yaml
+++ b/coin/instructions/coin_module_test_android_start_emulator.yaml
@@ -3,7 +3,7 @@ instructions:
- type: Group
instructions:
- type: ExecuteCommand
- command: "sh {{.InstallDir}}/libexec/android_emulator_launcher.sh"
+ command: "{{.InstallDir}}/libexec/android_emulator_launcher.sh"
maxTimeInSeconds: 300
maxTimeBetweenOutput: 300
userMessageOnFailure: "Failed to start emulator, check logs."
diff --git a/util/android/android_emulator_launcher.sh b/util/android/android_emulator_launcher.sh
index 841ac0ca06..4862a2c0aa 100755
--- a/util/android/android_emulator_launcher.sh
+++ b/util/android/android_emulator_launcher.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.