[Skiboot] [PATCH 2/5] ci: qemu boot tests should use built skiboot
Stewart Smith
stewart at linux.ibm.com
Fri Mar 29 14:25:05 AEDT 2019
Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
---
test/hello_world/run_qemu_hello_world.sh | 2 +-
test/run_qemu_boot_test.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh
index e105910d22bc..4f12958d9eda 100755
--- a/test/hello_world/run_qemu_hello_world.sh
+++ b/test/hello_world/run_qemu_hello_world.sh
@@ -31,7 +31,7 @@ trap "rm -f -- '$t'" EXIT
(
cat <<EOF | expect
set timeout 30
-spawn $QEMU_BIN $QEMU_ARGS -kernel $SKIBOOT_ZIMAGE -nographic
+spawn $QEMU_BIN -bios skiboot.lid $QEMU_ARGS -kernel $SKIBOOT_ZIMAGE -nographic
expect {
timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 }
eof { send_user "\nUnexpected EOF\n;" exit 1 }
diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh
index 9c5f4e52abb3..db657eed303b 100755
--- a/test/run_qemu_boot_test.sh
+++ b/test/run_qemu_boot_test.sh
@@ -34,7 +34,7 @@ T=$(mktemp --tmpdir skiboot_qemu_boot_test.XXXXXXXXXX)
( cat <<EOF | expect
set timeout 600
-spawn $QEMU_BIN $QEMU_ARGS -kernel $SKIBOOT_ZIMAGE
+spawn $QEMU_BIN $QEMU_ARGS -bios skiboot.lid -kernel $SKIBOOT_ZIMAGE
expect {
timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 }
eof { send_user "\nUnexpected EOF\n;" exit 1 }
--
2.20.1
More information about the Skiboot
mailing list