diff options
| author | 2021-02-10 21:27:00 +0000 | |
|---|---|---|
| committer | 2021-02-17 14:18:04 +0000 | |
| commit | 381d35c1b01401e193544f679bfaf4f5c197f7cd (patch) | |
| tree | 5673582c62d2fbf4390f06cb151c5ee8d62704b3 /tools/buildbot-setup-device.sh | |
| parent | f5f7e12172194ec2c6a7f70eeea936c5edf7c355 (diff) | |
ARM: Adjust timeout for ARM FVP runs.
Increases timeouts for ARM FVP runs as on FVP it
may take significally longer to finish the test (due
to emulation). Also rename the environment variable.
Test: art tests on FVP (steps in test/README.arm_fvp.md)
Change-Id: I0890dd85697bf901538694d28db3ffdd1bd4e0c4
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 00dc3bce99..2176f47988 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 ]] && [[ "$ART_TEST_DONT_REBOOT_DEVICE" != true ]]; then +if [[ $? == 124 ]] && [[ "$ART_TEST_RUN_ON_ARM_FVP" != true ]]; then echo -e "${green}Rebooting device to fix 'ps'${nc}" adb reboot adb wait-for-device root |