Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main am: b6fc19c308
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984453 Change-Id: Ie2d930c3d29e3e6f9c65a979649a7c73b5746329 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
b1aa489b06
1 changed files with 6 additions and 2 deletions
|
|
@ -1081,7 +1081,9 @@ LOG OK "no overlay present before setup"
|
|||
LOG RUN "Testing adb disable-verity -R"
|
||||
|
||||
T=$(adb_date)
|
||||
adb_su disable-verity -R >&2 ||
|
||||
adb_su disable-verity -R >&2
|
||||
err=${?}
|
||||
[[ ${err} -eq 0 || ${err} -eq 255 ]] ||
|
||||
die -t "${T}" "disable-verity -R failed"
|
||||
sleep 2
|
||||
adb_wait "${ADB_WAIT}" ||
|
||||
|
|
@ -1192,7 +1194,9 @@ LOG OK "adb remount from scratch"
|
|||
LOG RUN "Testing adb remount -R"
|
||||
|
||||
T=$(adb_date)
|
||||
adb_su remount -R </dev/null >&2 ||
|
||||
adb_su remount -R </dev/null >&2
|
||||
err=${?}
|
||||
[[ ${err} -eq 0 || ${err} -eq 255 ]] ||
|
||||
die -t "${T}" "adb remount -R failed"
|
||||
sleep 2
|
||||
adb_wait "${ADB_WAIT}" ||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue