commit 70fda27eb2a72958636c8026be7cc72881bdff25
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 21 17:14:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 21 17:14:31 2017 +0000
tree 34b2fc6eef8d41b521d63a47c480dcad4f0ea688
parent b7969272a3e7967b15b24fa56091b9cecea093de
parent 547063eab64b972c6a98f435767c051014b7be13

Merge "bootstat: kernel_panic test w/o bootloader or pstore support"

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}