commit de15542883a4b722c4d215746b26572b55718fff
author Mark Salyzyn <salyzyn@google.com> Tue Nov 21 17:22:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 21 17:22:03 2017 +0000
tree fded44860b1fa034694df1150ad34b8154f9eaa2
parent 85ae9a85ec514bec41ac45cc506104ab6bac789a
parent 9b7b4777cadb867e34528ec7460f262d33e6292b

Merge "bootstat: kernel_panic test w/o bootloader or pstore support" am: 70fda27eb2
am: 6c9f88863c

Change-Id: Ic0dbc48b73b20301028b0d4b4fa25fadb4ed0505

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}