summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2015-11-13 16:07:58 +0800
committerChase Qi <chase.qi@linaro.org>2015-11-13 16:08:06 +0800
commite2fb3aabe3e62d7f2213713eb6580ceedfc9b8e1 (patch)
tree703f44a470a5b09c83ec6e265ab988bcd4855a6f /android
parent3ab5a3a269ab109c2f7511687f01a0f2b6a74216 (diff)
android: cts: optimize adb device check
* Print adb device after it is online. * Increase adb_ping timeout to 10 seconds to adapte to slow environment. Change-Id: Ie6ff14c5d8cfed50143f023b824f83154fc15789 Signed-off-by: Chase Qi <chase.qi@linaro.org>
Diffstat (limited to 'android')
-rw-r--r--android/cts-host.yaml2
-rwxr-xr-xandroid/scripts/cts.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/cts-host.yaml b/android/cts-host.yaml
index 09ce457..ab3af5e 100644
--- a/android/cts-host.yaml
+++ b/android/cts-host.yaml
@@ -53,8 +53,8 @@ run:
- echo $CTS_URL
- echo $IPADDR
- echo $TEST_PARAMS
- - adb devices
- adb -s $IPADDR wait-for-device
+ - adb devices
- ./android/scripts/cts.py $CTS_URL $IPADDR $TEST_PARAMS
- echo "processes running"
- ps
diff --git a/android/scripts/cts.py b/android/scripts/cts.py
index c5e9633..a8c65b9 100755
--- a/android/scripts/cts.py
+++ b/android/scripts/cts.py
@@ -80,7 +80,7 @@ class Heartbeat(threading.Thread):
def run(self):
while 1:
if self._finished.isSet(): return
- return_code = self.adb_ping.run(timeout=1)
+ return_code = self.adb_ping.run(timeout=10)
if return_code != 0:
# terminate the test as adb connection is lost
print "terminating CTS for %s" % self.serial