diff options
| author | Ronny Chevalier <chevalier.ronny@gmail.com> | 2013-12-08 00:01:53 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-10 07:46:21 -0500 |
| commit | c6a77179a4097df355f0f04b8f3260c76b5e515c (patch) | |
| tree | 46e9ccfc64fd2f7981d48dc912a10a85de6daba8 /test/TEST-03-JOBS | |
| parent | 1a6dc6534e329f21aa2dcde5b8af4138bb4c11f1 (diff) | |
| download | systemd-c6a77179a4097df355f0f04b8f3260c76b5e515c.tar.gz systemd-c6a77179a4097df355f0f04b8f3260c76b5e515c.tar.bz2 systemd-c6a77179a4097df355f0f04b8f3260c76b5e515c.zip | |
test: rework run_qemu
It tries to find a suitable QEMU binary and will use KVM if present.
We can now configure QEMU from outside with 4 variables :
- $QEMU_BIN : path to QEMU's binary
- $KERNEL_APPEND : arguments appended to kernel cmdline
- $KERNEL_BIN : path to a kernel
Default /boot/vmlinuz-$KERNEL_VER
- $INITRD : path to an initramfs
Default /boot/initramfs-${KERNEL_VER}.img
- $QEMU_SMP : number of CPU simulated by QEMU.
Default 1
(from Alexander Graf's script: http://www.spinics.net/lists/kvm/msg72389.html)
Diffstat (limited to 'test/TEST-03-JOBS')
| -rwxr-xr-x | test/TEST-03-JOBS/test.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh index 630325867b..41e02e2c8a 100755 --- a/test/TEST-03-JOBS/test.sh +++ b/test/TEST-03-JOBS/test.sh @@ -5,9 +5,6 @@ TEST_DESCRIPTION="Job-related tests" . $TEST_BASE_DIR/test-functions -# Uncomment this to debug failures -#DEBUGFAIL="systemd.unit=multi-user.target" - check_result_qemu() { ret=1 mkdir -p $TESTDIR/root @@ -23,11 +20,10 @@ check_result_qemu() { } test_run() { - if check_qemu ; then - run_qemu + if run_qemu; then check_result_qemu || return 1 else - dwarn "can't run qemu-kvm, skipping" + dwarn "can't run QEMU, skipping" fi if check_nspawn; then run_nspawn |