diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2017-10-17 11:06:25 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2017-10-17 11:06:25 +0800 |
| commit | fe34b814bd8a801925d21e1f3d93323423c3bca0 (patch) | |
| tree | f00d2765bbcb0f88b6d4a8e772f93a0088aeed16 | |
| parent | f96c23687b4651218b1f85556638c46486ce2d29 (diff) | |
| parent | e68c7533debbbc2599f5cf5035d21a949799174c (diff) | |
Merge branch 'master' of ssh://git.linaro.org/people/yongqin.liu/public/test-definitions into self-master
| -rwxr-xr-x | automated/lib/android-test-lib | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/automated/lib/android-test-lib b/automated/lib/android-test-lib index 6dd06ce..087256c 100755 --- a/automated/lib/android-test-lib +++ b/automated/lib/android-test-lib @@ -59,7 +59,7 @@ initialize_adb() { adb_root() { if [ "$(adb shell whoami)" = "root" ]; then - echo "DUT already has adbd running as root" + info_msg "DUT already has adbd running as root" else adb root timeout 600 adb wait-for-device || error_msg "Device NOT found!" @@ -93,8 +93,6 @@ wait_boot_completed() { wait_homescreen() { [ "$#" -ne 1 ] && error_msg "Usage: wait_homescreen timeout_in_seconds" - timeout="$1" - end=$(( $(date +%s) + timeout )) # call disablesuspend.sh if it exists # on some builds, the launcher package might not be com.android.launcher, @@ -108,6 +106,8 @@ wait_homescreen() { fi fi + timeout="$1" + end=$(( $(date +%s) + timeout )) homescreen_displayed=false while [ "$(date +%s)" -lt "$end" ]; do if adb logcat -sd ActivityManager:I | grep "Displayed com.android.launcher"; then |