aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2019-03-28 18:01:06 +1100
committerStewart Smith <stewart@linux.ibm.com>2019-03-28 18:20:16 +1100
commitcb87cf17279b3feb3993f4f232c5b0474f1b6bff (patch)
tree7bfc0a778aeb5f44b6cdfe15ee04fba07fbde8e8
parentd0e56d97d4cd6d201313a4714860808b4c52d032 (diff)
downloadskiboot-cb87cf17279b3feb3993f4f232c5b0474f1b6bff.zip
skiboot-cb87cf17279b3feb3993f4f232c5b0474f1b6bff.tar.gz
skiboot-cb87cf17279b3feb3993f4f232c5b0474f1b6bff.tar.bz2
ci: qemu boot tests should use built skiboot
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rwxr-xr-xtest/hello_world/run_qemu_hello_world.sh2
-rwxr-xr-xtest/run_qemu_boot_test.sh2
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 e105910..4f12958 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 9c5f4e5..db657ee 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 }