Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d83ed7e authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: overlayfs: test inAdb and inFastboot" am: 42c9e7e3 

am: 245ad039

Change-Id: Iefa363ac509a20c63b4c296e8c72bce3615882d8
parents 8a9ddccb 245ad039

fs_mgr/tests/adb-remount-test.sh

+14 −3
Original line number Diff line number Diff line
@@ -36,14 +36,25 @@ NORMAL="${ESCAPE}[0m" 


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 @@ if ! inAdb; then 
  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