Merge "tests: handle legacy and new bootstat complete" am: 09b9fc56a2 am: 71c9eef34e
Change-Id: I6dfea2239b18eadea33c5b5e9e021df38288c8c5
diff --git a/bootstat/boot_reason_test.sh b/bootstat/boot_reason_test.sh
index 970ca94..2f2919f 100755
--- a/bootstat/boot_reason_test.sh
+++ b/bootstat/boot_reason_test.sh
@@ -230,16 +230,16 @@
if [ -n "`get_property sys.boot.reason`" ]
then
vals=`get_property |
- sed -n 's/[[]sys[.]\(boot_completed\|bootstat.first_boot_completed\)[]]: [[]\([01]\)[]]$/\1=\2/p'`
- if [ "${vals}" = "`echo boot_completed=1 ; echo bootstat.first_boot_completed=1`" ]
- then
- sleep 1
- break
- fi
- if [ "${vals}" = "`echo bootstat.first_boot_completed=1 ; echo boot_completed=1`" ]
- then
- sleep 1
- break
+ sed -n 's/[[]sys[.]\(boot_completed\|logbootcomplete\|bootstat[.]first_boot_completed\)[]]: [[]\([01]\)[]]$/\1=\2/p'`
+ if [ X"${vals}" != X"${vals##*boot_completed=1}" ]; then
+ if [ X"${vals}" != X"${vals##*logbootcomple=1}" ]; then
+ sleep 1
+ break
+ fi
+ if [ X"${vals}" != X"${vals##*bootstat.first_boot_completed=1}" ]; then
+ sleep 1
+ break
+ fi
fi
fi
fi
diff --git a/fs_mgr/tests/adb-remount-test.sh b/fs_mgr/tests/adb-remount-test.sh
index c66f307..e364436 100755
--- a/fs_mgr/tests/adb-remount-test.sh
+++ b/fs_mgr/tests/adb-remount-test.sh
@@ -474,20 +474,9 @@
if [ 0 != ${counter} ]; then
adb_wait
fi
- if [ -n "`get_property sys.boot.reason`" ]
- then
- vals=`get_property |
- sed -n 's/[[]sys[.]\(boot_completed\|logbootcomplete\)[]]: [[]\([01]\)[]]$/\1=\2/p'`
- if [ "${vals}" = "`echo boot_completed=1 ; echo logbootcomplete=1`" ]
- then
- sleep 1
- break
- fi
- if [ "${vals}" = "`echo logbootcomplete=1 ; echo boot_completed=1`" ]
- then
- sleep 1
- break
- fi
+ if [ "1" = "`get_property sys.boot_completed`" ]; then
+ sleep 1
+ break
fi
fi
counter=`expr ${counter} + 1`
@@ -858,7 +847,7 @@
USB_SERIAL=
[ -z "${ANDROID_SERIAL}" ] || USB_SERIAL=`find /sys/devices -name serial |
grep usb |
- xargs grep -l ${ANDROID_SERIAL}`
+ xargs -r grep -l ${ANDROID_SERIAL}`
USB_ADDRESS=
if [ -n "${USB_SERIAL}" ]; then
USB_ADDRESS=${USB_SERIAL%/serial}