[Skiboot] [PATCH] Mambo/Qemu boot tests: expect (and fail) on checkstop

[Stewart Smith]

This allows us to fail a lot faster if we checkstop

Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 test/hello_world/run_mambo_hello_world.sh          | 1 +
 test/hello_world/run_mambo_p9_hello_world.sh       | 1 +
 test/hello_world/run_qemu_hello_world.sh           | 1 +
 test/run_mambo_boot_test.sh                        | 1 +
 test/run_qemu-jessie-debian-installer_boot_test.sh | 1 +
 test/run_qemu_boot_test.sh                         | 1 +
 test/sreset_world/run_mambo_p9_sreset.sh           | 3 +++
 test/sreset_world/run_mambo_sreset.sh              | 3 +++
 8 files changed, 12 insertions(+)

diff --git a/test/hello_world/run_mambo_hello_world.sh b/test/hello_world/run_mambo_hello_world.sh
index 5b63ce0c6189..5bb92bced97d 100755
--- a/test/hello_world/run_mambo_hello_world.sh
+++ b/test/hello_world/run_mambo_hello_world.sh
@@ -42,6 +42,7 @@ spawn $MAMBO_PATH/$MAMBO_BINARY -n -f ../../test/hello_world/run_hello_world.tcl
 expect {
 timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
+"Machine Check Stop" { exit 1;}
 "Execution stopped: Sim Support exit requested stop"
 }
 wait
diff --git a/test/hello_world/run_mambo_p9_hello_world.sh b/test/hello_world/run_mambo_p9_hello_world.sh
index 9309a2f4c1f7..eee0f733981a 100755
--- a/test/hello_world/run_mambo_p9_hello_world.sh
+++ b/test/hello_world/run_mambo_p9_hello_world.sh
@@ -41,6 +41,7 @@ spawn $P9MAMBO_PATH/$P9MAMBO_BINARY -n -f ../../test/hello_world/run_hello_world
 expect {
 timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
+"Machine Check Stop" { exit 1;}
 "Execution stopped: Sim Support exit requested stop"
 }
 wait
diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh
index bcd0f563ae42..e08f851f2b08 100755
--- a/test/hello_world/run_qemu_hello_world.sh
+++ b/test/hello_world/run_qemu_hello_world.sh
@@ -38,6 +38,7 @@ spawn $QEMU_PATH/$QEMU_BINARY -m 1G -M powernv -kernel $SKIBOOT_ZIMAGE -nographi
 expect {
 timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
+"Machine Check Stop" { exit 1;}
 "Hello World!"
 }
 close
diff --git a/test/run_mambo_boot_test.sh b/test/run_mambo_boot_test.sh
index e028330e1869..fe0be0e3b63f 100755
--- a/test/run_mambo_boot_test.sh
+++ b/test/run_mambo_boot_test.sh
@@ -52,6 +52,7 @@ spawn $MAMBO_PATH/$MAMBO_BINARY -n -f ../../test/run_boot_test.tcl
 expect {
 timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
+"Machine Check Stop" { exit 1; }
 "Execution stopped: Sim Support exit requested stop"
 }
 wait
diff --git a/test/run_qemu-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh
index 36878a74d2ad..1fcda1199cc2 100755
--- a/test/run_qemu-jessie-debian-installer_boot_test.sh
+++ b/test/run_qemu-jessie-debian-installer_boot_test.sh
@@ -48,6 +48,7 @@ spawn $QEMU_PATH/$QEMU_BINARY -m 2G -M powernv -kernel debian-jessie-vmlinux -in
 expect {
 timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
+"Machine Check Stop" { exit 1;}
 "Starting system log daemon"
 }
 close
diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh
index 48abafa08ed2..b984afc22aef 100755
--- a/test/run_qemu_boot_test.sh
+++ b/test/run_qemu_boot_test.sh
@@ -41,6 +41,7 @@ spawn $QEMU_PATH/$QEMU_BINARY -m 3G -M powernv -kernel $SKIBOOT_ZIMAGE -nographi
 expect {
 timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
+"Machine Check Stop" { exit 1; }
 "Welcome to Petitboot"
 }
 close
diff --git a/test/sreset_world/run_mambo_p9_sreset.sh b/test/sreset_world/run_mambo_p9_sreset.sh
index b69fe173b16d..2d0d51a28fe3 100755
--- a/test/sreset_world/run_mambo_p9_sreset.sh
+++ b/test/sreset_world/run_mambo_p9_sreset.sh
@@ -40,16 +40,19 @@ spawn $P9MAMBO_PATH/$P9MAMBO_BINARY -n -f ../../test/sreset_world/run_sreset_wor
 expect {
 timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n"; exit 1 }
+"Machine Check Stop" { exit 1;}
 "Hello World!"
 }
 expect {
 timeout { send_user "\nTimeout waiting for Hello SRESET\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n"; exit 1 }
+"Machine Check Stop" { exit 1;}
 "Hello SRESET!"
 }
 expect {
 timeout { send_user "\nTimeout waiting for shutdown\n"; exit 1}
 eof { send_user "\nUnexpected EOF\n"; exit 1}
+"Machine Check Stop" { exit 1;}
 "Execution stopped: Sim Support exit requested stop"
 }
 wait
diff --git a/test/sreset_world/run_mambo_sreset.sh b/test/sreset_world/run_mambo_sreset.sh
index 1733c65878eb..281c466c6221 100755
--- a/test/sreset_world/run_mambo_sreset.sh
+++ b/test/sreset_world/run_mambo_sreset.sh
@@ -42,16 +42,19 @@ spawn $MAMBO_PATH/$MAMBO_BINARY -n -f ../../test/sreset_world/run_sreset_world.t
 expect {
 timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n"; exit 1 }
+"Machine Check Stop" { exit 1;}
 "Hello World!"
 }
 expect {
 timeout { send_user "\nTimeout waiting for Hello SRESET\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n"; exit 1 }
+"Machine Check Stop" { exit 1;}
 "Hello SRESET!"
 }
 expect {
 timeout { send_user "\nTimeout waiting for shutdown\n"; exit 1}
 eof { send_user "\nUnexpected EOF\n"; exit 1}
+"Machine Check Stop" { exit 1;}
 "Execution stopped: Sim Support exit requested stop"
 }
 wait
-- 
2.1.4