diff options
| author | 2020-05-20 00:09:13 +0100 | |
|---|---|---|
| committer | 2020-07-27 11:33:01 +0000 | |
| commit | c92e7032d2f9417c675788268a33396384ec8a13 (patch) | |
| tree | c58ff5f67acdea7a73137e5020c2aa8390e652dd /tools/buildbot-setup-device.sh | |
| parent | 556ace1620b7687c04e0b15853988d608395e3df (diff) | |
ART: Add ART_TEST_DONT_REBOOT_DEVICE flag.
Adds a flag to prevent the device from rebooting
during buildbot-setup-device.sh. This is useful when
running on Arm FVP - 'adb reboot' doesn't restart it
properly.
Test: test-art-target.
Change-Id: I9ff85c974da8248d35af0c9360fd38ace3c27f7e
Diffstat (limited to 'tools/buildbot-setup-device.sh')
| -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 |