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

Commit f6d8a631 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

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

This allows the test to run to completion on cuttlefish

Test: adb-remount-test.sh
Bug: 138649540
Change-Id: Ief00af72af94bf14c1d69499b12ece8cfce2f552
parent 91eb2c0a

fs_mgr/tests/adb-remount-test.sh

+4 −2
Original line number Diff line number Diff line
@@ -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