Skip to content

Commit

Permalink
Mambo/Qemu boot tests: expect (and fail) on checkstop
Browse files Browse the repository at this point in the history
This allows us to fail a lot faster if we checkstop

Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
  • Loading branch information
stewartsmith committed Mar 31, 2017
1 parent 0a7449c commit 03f9702
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions test/hello_world/run_mambo_hello_world.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/hello_world/run_mambo_p9_hello_world.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/hello_world/run_qemu_hello_world.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/run_mambo_boot_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/run_qemu-jessie-debian-installer_boot_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/run_qemu_boot_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions test/sreset_world/run_mambo_p9_sreset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions test/sreset_world/run_mambo_sreset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 03f9702

Please sign in to comment.