diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2019-05-16 16:29:50 +0100 |
|---|---|---|
| committer | mwasilew <milosz.wasilewski@linaro.org> | 2019-05-20 09:55:54 +0100 |
| commit | aab26e5a4298ff8fe496f4e29cc8730ef78dc71f (patch) | |
| tree | bc827303304da52d325405d00d313cd61c9e03c8 | |
| parent | 934cce838cb11acb46f8efe8d6cc5ef02b6c71fc (diff) | |
automated/android: bail in case adb root times out
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
| -rwxr-xr-x | automated/lib/android-test-lib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automated/lib/android-test-lib b/automated/lib/android-test-lib index 6525d498..2fc058be 100755 --- a/automated/lib/android-test-lib +++ b/automated/lib/android-test-lib @@ -62,8 +62,8 @@ adb_root() { if [ "$(adb shell whoami)" = "root" ]; then echo "DUT already has adbd running as root" else - adb root - timeout 600 adb wait-for-device || error_msg "Device NOT found!" + adb root || info_msg "adb root timed out" + timeout 600 adb wait-for-device || error_fatal "Device NOT found!" adb devices # After adb root, device number within the USB bus changes. adb_debug_info |