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

Commit 09b9fc56 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "tests: handle legacy and new bootstat complete"

parents 44da3704 3576ed04

bootstat/boot_reason_test.sh

+10 −10
Original line number Diff line number Diff line
@@ -230,19 +230,19 @@ wait_for_screen() { 
      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

              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 [ "${vals}" = "`echo bootstat.first_boot_completed=1 ; echo boot_completed=1`" ]

        then

          if [ X"${vals}" != X"${vals##*bootstat.first_boot_completed=1}" ]; then

            sleep 1

            break

          fi

        fi

      fi

    fi

    counter=`expr ${counter} + 1`

    if [ ${counter} -gt ${timeout} ]; then

      ${exit_function}

fs_mgr/tests/adb-remount-test.sh

+4 −15
Original line number Diff line number Diff line
@@ -474,21 +474,10 @@ wait_for_screen() { 
      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

      if [ "1" = "`get_property sys.boot_completed`" ]; then

        sleep 1

        break

      fi

        if [ "${vals}" = "`echo logbootcomplete=1 ; echo boot_completed=1`" ]

        then

          sleep 1

          break

        fi

      fi

    fi

    counter=`expr ${counter} + 1`

    if [ ${counter} -gt ${timeout} ]; then
@@ -858,7 +847,7 @@ D=`get_property ro.serialno` 
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}