ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adb-remount-test: support devices that do not have verity

Browse source 
This allows the test to run to completion on cuttlefish

Test: adb-remount-test.sh
Bug: 138649540
Change-Id: Ief00af72af94bf14c1d69499b12ece8cfce2f552
This commit is contained in:
Mark Salyzyn 2019-07-24 15:24:28 -07:00
parent 91eb2c0a25
commit f6d8a631fa
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/tests/adb-remount-test.sh
View file

@ -1425,7 +1425,7 @@ check_eq "cat: /system/hello: No such file or directory" "${B}" after rm
B="`adb_cat /vendor/hello`"
check_eq "cat: /vendor/hello: No such file or directory" "${B}" after rm
if [ -n "${scratch_partition}" ]; then
if ${is_bootloader_fastboot} && [ -n "${scratch_partition}" ]; then
echo "${GREEN}[ RUN ]${NORMAL} test fastboot flash to ${scratch_partition} recovery" >&2
@ -1567,7 +1567,9 @@ if ${overlayfs_supported}; then
adb_wait ${ADB_WAIT} ||
die "adb remount -R"
if [ "orange" != "`get_property ro.boot.verifiedbootstate`" -o \
"2" = "`get_property partition.system.verified`" ]; then
"2" = "`get_property partition.system.verified`" ] &&
[ -n "`get_property ro.boot.verifiedbootstate`" -o \
-n "`get_property partition.system.verified`" ]; then
die "remount -R command failed to disable verity"
fi