summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2017-09-26 07:23:27 +0800
committerChase Qi <chase.qi@linaro.org>2017-09-27 01:56:32 +0800
commit5f374f6b67e08cb349891e86d5a8188b5633e79b (patch)
tree2d661c3183cc02a9d04321c57af87358bcc648a9
parent1c148fb0d0b462a041aad55aee30b9a212bf0c1a (diff)
android: set 'adb wait-for-device' timeout to 10 minutes
Change-Id: Iaa4a2178788c1bb461a4463bc697fd0c28ab2cb5 Signed-off-by: Chase Qi <chase.qi@linaro.org>
-rwxr-xr-xautomated/lib/android-test-lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/automated/lib/android-test-lib b/automated/lib/android-test-lib
index 4c515ce..16db841 100755
--- a/automated/lib/android-test-lib
+++ b/automated/lib/android-test-lib
@@ -32,7 +32,7 @@ initialize_adb() {
set -x
adb_debug_info
adb start-server
- adb wait-for-device
+ timeout 600 adb wait-for-device || error_msg "Device NOT found!"
adb devices
if [ -z "${ANDROID_SERIAL}" ]; then
@@ -62,7 +62,7 @@ adb_root() {
echo "DUT already has adbd running as root"
else
adb root
- adb wait-for-device
+ timeout 600 adb wait-for-device || error_msg "Device NOT found!"
adb devices
# After adb root, device number within the USB bus changes.
adb_debug_info