diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-13 21:17:38 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-13 21:17:38 -0400 |
| commit | c73c7c774cbd1f0e778254d51da819490a333ab4 (patch) | |
| tree | 2db5fa808791e0b4fc671537690264caee56e6da /test/TEST-08-ISSUE-2730 | |
| parent | 5496aef5f410ca665c76fb1bbfb584c7925fd49e (diff) | |
| parent | b3ec0a0674f4e499bcb6d2469acdf9d2d574c3d6 (diff) | |
Merge branch 'systemd/parabola' into notsystemd/premove
# Conflicts:
# Makefile.am
# tmpfiles.d/etc.conf.m4
Diffstat (limited to 'test/TEST-08-ISSUE-2730')
| -rwxr-xr-x | test/TEST-08-ISSUE-2730/test.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh index 409140157a..44831983b3 100755 --- a/test/TEST-08-ISSUE-2730/test.sh +++ b/test/TEST-08-ISSUE-2730/test.sh @@ -19,12 +19,16 @@ check_result_qemu() { [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed ls -l $TESTDIR/journal/*/*.journal test -s $TESTDIR/failed && ret=$(($ret+1)) + [ -n "$TIMED_OUT" ] && ret=$(($ret+1)) return $ret } 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 } |