diff options
| author |  kjlubick <kjlubick@google.com> | 2016-09-08 13:04:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-08 13:04:31 -0700 |
| commit | b4403ee980dcc05fbefba7e587884032e893f8f8 (patch) | |
| tree | 43f49edc2b1abd3a8eb4de553e3bff89db5ba185 /platform_tools | |
| parent | b3cb2142725f9d0cd88a7200770536bc21f73b14 (diff) | |
Fix strange failures on Android N
We were seeing problems where dm ended with exit code 0, but the step still failed.
It seems they changed what N returns when a thing completes.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2319843003
TBR=bugsbunny
Review-Url: https://codereview.chromium.org/2319843003
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_run_skia | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia index 95d9fd94f9..c4e9056d7e 100755 --- a/platform_tools/android/bin/android_run_skia +++ b/platform_tools/android/bin/android_run_skia @@ -27,7 +27,7 @@ if [[ -n $RESOURCE_PATH ]]; then fi if [ $LOGCAT ]; then - verbose "clearing the device logs..." + verbose "clearing the device logs..." $ADB $DEVICE_SERIAL logcat -c; fi STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" @@ -44,7 +44,7 @@ $ADB ${DEVICE_SERIAL} push ${CMD_FILENAME} /data/local/tmp rm ${CMD_FILENAME} verbose "preparing to run ${APP_ARGS[0]} on the device..." $ADB ${DEVICE_SERIAL} shell sh /data/local/tmp/${CMD_FILENAME} - + if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -d; fi echo "***********************************************************************" @@ -66,7 +66,7 @@ if [[ ${EXIT_CODE} == *${STATUS_FILENAME}* ]]; then fi echo "EXIT_CODE is ${EXIT_CODE}" -if [ $'0\r' != "${EXIT_CODE}" ]; then +if [[ "${EXIT_CODE}" != 0* ]]; then if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -d; fi exit 1 fi |