commit a9e4650ada6d3d54459f015f7cd16bfe79c26cb0
author Chen Xu <fionaxu@google.com> Wed Nov 22 04:31:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 22 04:31:29 2017 +0000
tree aa7ba2d4a31efccd5bf0e1b5ce27bf142aaffc7c
parent e994604d2feb246d4a83d558f46b3aa8b188f5bf
parent f0d1a4b0d27db517513271de259929aa330878bd

Merge "a new folder to store OTA carrier id update"

bootstat/boot_reason_test.sh

diff --git a/bootstat/boot_reason_test.sh b/bootstat/boot_reason_test.sh
index c1d5430..79702a6 100755
--- a/bootstat/boot_reason_test.sh
+++ b/bootstat/boot_reason_test.sh
@@ -778,7 +778,12 @@
   checkDebugBuild || return
   duration_test ">90"
   panic_msg="kernel_panic,sysrq"
-  enterPstore || panic_msg="\(kernel_panic,sysrq\|kernel_panic\)"
+  enterPstore
+  if [ ${?} != 0 ]; then
+    echo "         or functional bootloader" >&2
+    panic_msg="\(kernel_panic,sysrq\|kernel_panic\)"
+    pstore_ok=true
+  fi
   echo c | adb shell su root tee /proc/sysrq-trigger >/dev/null
   wait_for_screen
   EXPECT_PROPERTY sys.boot.reason ${panic_msg}