commit c92e7032d2f9417c675788268a33396384ec8a13
author Artem Serov <artem.serov@linaro.org> Wed May 20 00:09:13 2020 +0100
committer Roland Levillain <rpl@google.com> Mon Jul 27 11:33:01 2020 +0000
tree c58ff5f67acdea7a73137e5020c2aa8390e652dd
parent 556ace1620b7687c04e0b15853988d608395e3df

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

tools/buildbot-setup-device.sh

diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh
index b139c47..10f526c 100755
--- a/tools/buildbot-setup-device.sh
+++ b/tools/buildbot-setup-device.sh
@@ -101,7 +101,7 @@
 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