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

Merge "tests: handle legacy and new bootstat complete"

Browse source
This commit is contained in:
Treehugger Robot 2020-02-04 19:06:42 +00:00 • committed by Gerrit Code Review
commit 09b9fc56a2
2 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bootstat/boot_reason_test.sh
View file

@ -230,16 +230,16 @@ wait_for_screen() {
if [ -n "`get_property sys.boot.reason`" ] if [ -n "`get_property sys.boot.reason`" ]
then then
vals=`get_property | vals=`get_property |
sed -n 's/[[]sys[.]\(boot_completed\|bootstat.first_boot_completed\)[]]: [[]\([01]\)[]]$/\1=\2/p'` sed -n 's/[[]sys[.]\(boot_completed\|logbootcomplete\|bootstat[.]first_boot_completed\)[]]: [[]\([01]\)[]]$/\1=\2/p'`
if [ "${vals}" = "`echo boot_completed=1 ; echo bootstat.first_boot_completed=1`" ] if [ X"${vals}" != X"${vals##*boot_completed=1}" ]; then
then if [ X"${vals}" != X"${vals##*logbootcomple=1}" ]; then
sleep 1 sleep 1
break break
fi fi
if [ "${vals}" = "`echo bootstat.first_boot_completed=1 ; echo boot_completed=1`" ] if [ X"${vals}" != X"${vals##*bootstat.first_boot_completed=1}" ]; then
then sleep 1
sleep 1 break
break fi
fi fi
fi fi
fi fi

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

@ -474,20 +474,9 @@ wait_for_screen() {
if [ 0 != ${counter} ]; then if [ 0 != ${counter} ]; then
adb_wait adb_wait
fi fi
if [ -n "`get_property sys.boot.reason`" ] if [ "1" = "`get_property sys.boot_completed`" ]; then
then sleep 1
vals=`get_property | break
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
fi fi
fi fi
counter=`expr ${counter} + 1` counter=`expr ${counter} + 1`
@ -858,7 +847,7 @@ D=`get_property ro.serialno`
USB_SERIAL= USB_SERIAL=
[ -z "${ANDROID_SERIAL}" ] || USB_SERIAL=`find /sys/devices -name serial | [ -z "${ANDROID_SERIAL}" ] || USB_SERIAL=`find /sys/devices -name serial |
grep usb | grep usb |
xargs grep -l ${ANDROID_SERIAL}` xargs -r grep -l ${ANDROID_SERIAL}`
USB_ADDRESS= USB_ADDRESS=
if [ -n "${USB_SERIAL}" ]; then if [ -n "${USB_SERIAL}" ]; then
USB_ADDRESS=${USB_SERIAL%/serial} USB_ADDRESS=${USB_SERIAL%/serial}