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

am: ae3bbc2fa2 Change-Id: Ied94a5c7a49d8cf252cca1c98624f504e8e82f2a
2017-11-21 17:24:36 +00:00 · 2017-11-21 17:24:36 +00:00 · aa9f6ee9ee
parent 43142c4286 ae3bbc2fa2
commit aa9f6ee9ee
1 changed files with 6 additions and 1 deletions
--- a/bootstat/boot_reason_test.sh
+++ b/bootstat/boot_reason_test.sh
@ -778,7 +778,12 @@ test_kernel_panic() {
  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}