summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2022-01-04 18:10:17 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-06 16:11:10 +0000
commitc068f75b2a258abdf113cf2de9e1041c2b09d8a5 (patch)
tree7dd28be7c7b46dded879738a73d565ae418446d7 /util
parent8d1ec1449ddee363b8a94dfca6965b7b97959a37 (diff)
Do not hide android emulator output
It might print useful messages, even though they might come mixed with other test messages. However we can't leave stdout/stderr as is, because Coin agent hangs at the end of the shell script, waiting for them to close. So we just redirect them to a file. Change-Id: I797af78786b7df31131b3c3261e1c1fc00e5d460 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 8bf1beb9bd4281626eb6740a69ccb7cb70e56ae7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
-rwxr-xr-xutil/android/android_emulator_launcher.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/util/android/android_emulator_launcher.sh b/util/android/android_emulator_launcher.sh
index 92f78f64b2..85308cacba 100755
--- a/util/android/android_emulator_launcher.sh
+++ b/util/android/android_emulator_launcher.sh
@@ -66,7 +66,10 @@ for counter in `seq 1 ${EMULATOR_MAX_RETRIES}`; do
fi
echo "Starting emulator, try ${counter}/${EMULATOR_MAX_RETRIES}"
- $EMULATOR_EXEC $EMULATOR_NAME -gpu swiftshader_indirect -no-audio -partition-size 4096 -cores 4 -memory 3500 -no-snapshot-load -no-snapshot-save &>/dev/null &
+ $EMULATOR_EXEC $EMULATOR_NAME \
+ -gpu swiftshader_indirect -no-audio -partition-size 4096 \
+ -cores 4 -memory 3500 -no-snapshot-load -no-snapshot-save \
+ >$HOME/emulator.log 2>&1 &
emulator_pid=$!
$ADB_EXEC wait-for-device