diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-08-26 18:19:18 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-08-26 18:21:10 +1000 |
| commit | 4a74a1ea1c27d7f0e46d2df0e87a9f9958da6a6c (patch) | |
| tree | 6f47fecb94883ae10de5a19052184424117214d0 /test | |
| parent | dc60d645d384a51de7085518dbb4e895a5f8c3a7 (diff) | |
| download | talos-skiboot-4a74a1ea1c27d7f0e46d2df0e87a9f9958da6a6c.tar.gz talos-skiboot-4a74a1ea1c27d7f0e46d2df0e87a9f9958da6a6c.zip | |
test/qemu: bump qemu version used in CI, adds IPMI support
Now based on Cédric's branch.
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/run_qemu-jessie-debian-installer_boot_test.sh | 2 | ||||
| -rwxr-xr-x | test/run_qemu_boot_test.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/run_qemu-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh index 0bdd8696..36878a74 100755 --- a/test/run_qemu-jessie-debian-installer_boot_test.sh +++ b/test/run_qemu-jessie-debian-installer_boot_test.sh @@ -44,7 +44,7 @@ $QEMU_PATH/../qemu-img create -f qcow2 $D 128G 2>&1 > $T ( cat <<EOF | expect set timeout 600 -spawn $QEMU_PATH/$QEMU_BINARY -m 2G -M powernv -kernel debian-jessie-vmlinux -initrd debian-jessie-initrd.gz -nographic -hda $D +spawn $QEMU_PATH/$QEMU_BINARY -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 expect { timeout { send_user "\nTimeout waiting for petitboot\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 4809810f..48abafa0 100755 --- a/test/run_qemu_boot_test.sh +++ b/test/run_qemu_boot_test.sh @@ -37,7 +37,7 @@ T=`mktemp --tmpdir skiboot_qemu_boot_test.XXXXXXXXXX` ( cat <<EOF | expect set timeout 600 -spawn $QEMU_PATH/$QEMU_BINARY -m 1G -M powernv -kernel $SKIBOOT_ZIMAGE -nographic +spawn $QEMU_PATH/$QEMU_BINARY -m 3G -M powernv -kernel $SKIBOOT_ZIMAGE -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 } |
