diff options
Diffstat (limited to 'automated/lib/android-test-lib')
| -rwxr-xr-x | automated/lib/android-test-lib | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/automated/lib/android-test-lib b/automated/lib/android-test-lib index 552dd31..283b244 100755 --- a/automated/lib/android-test-lib +++ b/automated/lib/android-test-lib @@ -36,11 +36,15 @@ initialize_adb() { } adb_root() { - adb root & - which lava-lxc-device-wait-add && lava-lxc-device-wait-add - which lava-lxc-device-add && lava-lxc-device-add - adb wait-for-device - adb devices + if [ "$(adb shell whoami)" = "root" ]; then + echo "DUT already has adbd running as root" + else + adb root & + which lava-lxc-device-wait-add && lava-lxc-device-wait-add + which lava-lxc-device-add && lava-lxc-device-add + adb wait-for-device + adb devices + fi } wait_boot_completed() { |