commit da5bee110c79ae7dd0e5de74dad5757503ce16fd
author Mark Salyzyn <salyzyn@google.com> Thu Dec 13 20:31:18 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 13 20:31:18 2018 -0800
tree 31f184f4e76e7b6f8cc6ee9b1d659847f2e40784
parent ca4fd7bd6f0a155c3ef866a61cb2aaeff2400188
parent cd248d1728e549bd57fe0643481b0a535e6f5195

Merge "fs_mgr: overlayfs: test inAdb and inFastboot" am: 42c9e7e393 am: 245ad039f1
am: 4d83ed7e37

Change-Id: I4b9106b21e13b759ce618c2e0729aa41de798b4a

fs_mgr/tests/adb-remount-test.sh

diff --git a/fs_mgr/tests/adb-remount-test.sh b/fs_mgr/tests/adb-remount-test.sh
index fde82b4..aaee1a7 100755
--- a/fs_mgr/tests/adb-remount-test.sh
+++ b/fs_mgr/tests/adb-remount-test.sh
@@ -36,14 +36,25 @@
 
 Returns: true if device is in fastboot mode" ]
 inFastboot() {
-  fastboot devices | grep "^${ANDROID_SERIAL}[${SPACE}${TAB}]" > /dev/null
+  fastboot devices |
+    if [ -n "${ANDROID_SERIAL}" ]; then
+      grep "^${ANDROID_SERIAL}[${SPACE}${TAB}]" > /dev/null
+    else
+      wc -l | grep '^1$' >/dev/null
+    fi
 }
 
 [ "USAGE: inAdb
 
 Returns: true if device is in adb mode" ]
 inAdb() {
-  adb devices | grep -v 'List of devices attached' | grep "^${ANDROID_SERIAL}[${SPACE}${TAB}]" > /dev/null
+  adb devices |
+    grep -v 'List of devices attached' |
+    if [ -n "${ANDROID_SERIAL}" ]; then
+      grep "^${ANDROID_SERIAL}[${SPACE}${TAB}]" > /dev/null
+    else
+      wc -l | grep '^1$' >/dev/null
+    fi
 }
 
 [ "USAGE: adb_sh <commands> </dev/stdin >/dev/stdout 2>/dev/stderr
@@ -277,7 +288,7 @@
   echo "${ORANGE}[  WARNING ]${NORMAL} device not in adb mode ... waiting 2 minutes"
   adb_wait 2m
 fi
-inAdb || die "device not in adb mode"
+inAdb || die "specified device not in adb mode"
 isDebuggable || die "device not a debug build"
 
 # Do something