diff options
| author | Dimitrios Apostolou <jimis@qt.io> | 2022-01-04 18:10:17 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-06 16:11:11 +0000 |
| commit | 6250f2f0061568867ba6ec418b64e7723fdbf469 (patch) | |
| tree | 4025e1a9d413b1ce0eb71685186e0bf5341446a8 | |
| parent | cdc60890c5fcda29bce09be602fc5c27f5fa3f82 (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>
| -rwxr-xr-x | util/android/android_emulator_launcher.sh | 5 |
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 |