diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-23 10:23:29 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-24 11:28:35 +0200 |
| commit | eaa03c05f72b20610fc7c3b0e943d032fa78f0d1 (patch) | |
| tree | fdb9fb018d9adcc98796405e40aefdd10f775cbc | |
| parent | tests: force booting the kernel with SELinux (diff) | |
| download | systemd-eaa03c05f72b20610fc7c3b0e943d032fa78f0d1.tar.xz systemd-eaa03c05f72b20610fc7c3b0e943d032fa78f0d1.zip | |
tests: don't fail if QEMU is not available
Fix TEST-{08,09,10,11} to properly skip the test if QEMU is not available
instead of failing, like in the other tests.
| -rwxr-xr-x | test/TEST-08-ISSUE-2730/test.sh | 7 | ||||
| -rwxr-xr-x | test/TEST-09-ISSUE-2691/test.sh | 7 | ||||
| -rwxr-xr-x | test/TEST-10-ISSUE-2467/test.sh | 7 | ||||
| -rwxr-xr-x | test/TEST-11-ISSUE-3166/test.sh | 7 |
4 files changed, 20 insertions, 8 deletions
diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh index 409140157a..e3b42a5254 100755 --- a/test/TEST-08-ISSUE-2730/test.sh +++ b/test/TEST-08-ISSUE-2730/test.sh @@ -23,8 +23,11 @@ check_result_qemu() { } test_run() { - run_qemu || return 1 - check_result_qemu || return 1 + if run_qemu; then + check_result_qemu || return 1 + else + dwarn "can't run QEMU, skipping" + fi return 0 } diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh index e247694f01..a782cad37d 100755 --- a/test/TEST-09-ISSUE-2691/test.sh +++ b/test/TEST-09-ISSUE-2691/test.sh @@ -22,8 +22,11 @@ check_result_qemu() { } test_run() { - run_qemu || return 1 - check_result_qemu || return 1 + if run_qemu; then + check_result_qemu || return 1 + else + dwarn "can't run QEMU, skipping" + fi return 0 } diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh index a652b0d812..4eca6784bc 100755 --- a/test/TEST-10-ISSUE-2467/test.sh +++ b/test/TEST-10-ISSUE-2467/test.sh @@ -21,8 +21,11 @@ check_result_qemu() { } test_run() { - run_qemu || return 1 - check_result_qemu || return 1 + if run_qemu; then + check_result_qemu || return 1 + else + dwarn "can't run QEMU, skipping" + fi return 0 } diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh index 7913537e9b..0f269c8211 100755 --- a/test/TEST-11-ISSUE-3166/test.sh +++ b/test/TEST-11-ISSUE-3166/test.sh @@ -21,8 +21,11 @@ check_result_qemu() { } test_run() { - run_qemu || return 1 - check_result_qemu || return 1 + if run_qemu; then + check_result_qemu || return 1 + else + dwarn "can't run QEMU, skipping" + fi return 0 } |