diff options
author | Stewart Smith <stewart@linux.ibm.com> | 2018-06-26 14:33:31 +1000 |
---|---|---|
committer | Stewart Smith <stewart@linux.ibm.com> | 2018-06-27 14:33:40 +1000 |
commit | af1cbe34c85d9a6c9f4669ecd6fa91aaa1366c27 (patch) | |
tree | 8085b96c382eff2d9e0ee5e6b6319c92c2bbc3ff /test | |
parent | 5235791bbc66f1d14919f588ae24fbbbda2a0a2e (diff) | |
download | skiboot-af1cbe34c85d9a6c9f4669ecd6fa91aaa1366c27.zip skiboot-af1cbe34c85d9a6c9f4669ecd6fa91aaa1366c27.tar.gz skiboot-af1cbe34c85d9a6c9f4669ecd6fa91aaa1366c27.tar.bz2 |
test/qemu: start building qemu again, and use our built qemu for tests
We need to use QEMU_BIN rather than QEMU as the makefiles define
QEMU already.
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'test')
-rwxr-xr-x | test/hello_world/run_qemu_hello_world.sh | 10 | ||||
-rwxr-xr-x | test/run_qemu-jessie-debian-installer_boot_test.sh | 10 | ||||
-rwxr-xr-x | test/run_qemu_boot_test.sh | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh index cc5055e..3f0aa55 100755 --- a/test/hello_world/run_qemu_hello_world.sh +++ b/test/hello_world/run_qemu_hello_world.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [ -z "$QEMU" ]; then - QEMU="qemu-system-ppc64" +if [ -z "$QEMU_BIN" ]; then + QEMU_BIN="qemu-system-ppc64" fi -if [ ! `command -v $QEMU` ]; then - echo 'Could not find executable QEMU. Skipping hello_world test'; +if [ ! `command -v $QEMU_BIN` ]; then + echo "Could not find executable QEMU_BIN ($QEMU_BIN). Skipping hello_world test"; exit 0; fi @@ -30,7 +30,7 @@ trap "rm -f -- '$t'" EXIT ( cat <<EOF | expect set timeout 30 -spawn $QEMU -m 1G -M powernv -kernel $SKIBOOT_ZIMAGE -nographic +spawn $QEMU_BIN -m 1G -M powernv -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-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh index 12f2e23..63c4d29 100755 --- a/test/run_qemu-jessie-debian-installer_boot_test.sh +++ b/test/run_qemu-jessie-debian-installer_boot_test.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [ -z "$QEMU" ]; then - QEMU="qemu-system-ppc64" +if [ -z "$QEMU_BIN" ]; then + QEMU_BIN="qemu-system-ppc64" fi -if [ ! `command -v qemu-system-ppc64` ]; then - echo 'Could not find executable QEMU. Skipping hello_world test'; +if [ ! `command -v $QEMU_BIN` ]; then + echo "Could not find executable QEMU_BIN ($QEMU_BIN). Skipping hello_world test"; exit 0; fi @@ -39,7 +39,7 @@ T=`mktemp --tmpdir skiboot_qemu_debian-jessie-boot_test.XXXXXXXXXX` ( 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 +spawn $QEMU_BIN -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 } diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh index 370388c..bfcf485 100755 --- a/test/run_qemu_boot_test.sh +++ b/test/run_qemu_boot_test.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [ -z "$QEMU" ]; then - QEMU="qemu-system-ppc64" +if [ -z "$QEMU_BIN" ]; then + QEMU_BIN="qemu-system-ppc64" fi -if [ ! `command -v qemu-system-ppc64` ]; then - echo 'Could not find executable QEMU. Skipping hello_world test'; +if [ ! `command -v $QEMU_BIN` ]; then + echo "Could not find executable QEMU_BIN ($QEMU_BIN). Skipping hello_world test"; exit 0; fi @@ -33,7 +33,7 @@ T=`mktemp --tmpdir skiboot_qemu_boot_test.XXXXXXXXXX` ( cat <<EOF | expect set timeout 600 -spawn $QEMU -m 3G -M powernv -kernel $SKIBOOT_ZIMAGE -nographic -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0 +spawn $QEMU_BIN -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 } |