Skip to content

Commit

Permalink
macos android ci: fix poll adb timeout not dumping app log
Browse files Browse the repository at this point in the history
  • Loading branch information
mribbons committed Apr 25, 2023
1 parent 72cf2a3 commit b04d88f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions test/scripts/poll-adb-logcat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ done < <($adb logcat --pid="$pid") & logcat_pid=$!
# This section dumps the entire process log after it has gone away, note that we don't want the entire log on failed tests that were successfully reported
count=0
timeout=300
echo "Waiting 5m before aborting tests..."
[[ -z "$CI" ]] && timeout=30
[[ -z "$CI" ]] && echo "Waiting 30s before aborting tests..."
[[ -n "$CI" ]] && echo "Waiting 5m before aborting tests..."

# while [[ "$(watchdog_file_exists)" == "0" ]]; do
while (( count < timeout )) ; do
Expand All @@ -166,5 +168,6 @@ else
fi

echo "poll-adb-logcat.sh exiting without signal from adb loop"
[[ -n "$pid" ]] && dump_pid $pid
wait $logcat_pid
exit 254
exit 254

0 comments on commit b04d88f

Please sign in to comment.