diff options
| -rwxr-xr-x | tools/buildbot-setup-device.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh index b139c4755c..10f526c924 100755 --- a/tools/buildbot-setup-device.sh +++ b/tools/buildbot-setup-device.sh @@ -101,7 +101,7 @@ $verbose && adb logcat -p echo -e "${green}Kill stalled dalvikvm processes${nc}" # 'ps' on M can sometimes hang. timeout 2s adb shell "ps" >/dev/null -if [ $? = 124 ]; then +if [[ $? == 124 ]] && [[ "$ART_TEST_DONT_REBOOT_DEVICE" != true ]]; then echo -e "${green}Rebooting device to fix 'ps'${nc}" adb reboot adb wait-for-device root |