aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2018-05-08 19:52:59 +0930
committerStewart Smith <stewart@linux.ibm.com>2018-05-09 10:17:42 -0500
commitef280be1657a32f9e0b69a216d64a2e0954a19a8 (patch)
tree74a339fbba9b0a01c6544b5d780314f30c78fd65
parent5fc61b48680180a7a66d2ada4878b229825e8e51 (diff)
downloadskiboot-ef280be1657a32f9e0b69a216d64a2e0954a19a8.zip
skiboot-ef280be1657a32f9e0b69a216d64a2e0954a19a8.tar.gz
skiboot-ef280be1657a32f9e0b69a216d64a2e0954a19a8.tar.bz2
qemu-debian-test: Remove unusable hda option
When running this: qemu-system-ppc64 -m 2G -M powernv -kernel debian-jessie-vmlinux \ -initrd debian-jessie-initrd.gz -nographic \ -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0 \ -hda /tmp/debian-jessie-install.qcow2.kDubGYDrqa We die with this error: qemu-system-ppc64: -hda /tmp/debian-jessie-install.qcow2.kDubGYDrqa: machine type does not support if=ide,bus=0,unit=0 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rwxr-xr-xtest/run_qemu-jessie-debian-installer_boot_test.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/run_qemu-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh
index da946e6..6064858 100755
--- a/test/run_qemu-jessie-debian-installer_boot_test.sh
+++ b/test/run_qemu-jessie-debian-installer_boot_test.sh
@@ -31,16 +31,15 @@ if [ ! -f debian-jessie-initrd.gz ]; then
fi
T=`mktemp --tmpdir skiboot_qemu_debian-jessie-boot_test.XXXXXXXXXX`
-D=`mktemp --tmpdir debian-jessie-install.qcow2.XXXXXXXXXX`
+#D=`mktemp --tmpdir debian-jessie-install.qcow2.XXXXXXXXXX`
# In future we should do full install:
# FIXME: -append "DEBIAN_FRONTEND=text locale=en_US keymap=us hostname=OPALtest domain=unassigned-domain rescue/enable=true"
-
-qemu-img create -f qcow2 $D 128G 2>&1 > $T
+# qemu-img create -f qcow2 $D 128G 2>&1 > $T
( cat <<EOF | expect
set timeout 600
-spawn $QEMU -m 2G -M powernv -kernel debian-jessie-vmlinux -initrd debian-jessie-initrd.gz -nographic -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0 -hda $D
+spawn $QEMU -m 2G -M powernv -kernel debian-jessie-vmlinux -initrd debian-jessie-initrd.gz -nographic -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0
expect {
timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 }
eof { send_user "\nUnexpected EOF\n;" exit 1 }