diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2016-06-24 19:44:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 19:44:18 +0300 |
| commit | d946fb596f7ed010dce6685a499e0aebef00e451 (patch) | |
| tree | fcf9d56b1f966f421e639c63b41c3edc3c657817 /test/TEST-09-ISSUE-2691 | |
| parent | 6edefe0b064e57af108f56172b3dafa0be61e234 (diff) | |
| parent | 7cad32bbdeed20ac0daf6049ab093db902f4a4e7 (diff) | |
Merge pull request #3587 from martinpitt/master
Fix some test issues
Diffstat (limited to 'test/TEST-09-ISSUE-2691')
| -rwxr-xr-x | test/TEST-09-ISSUE-2691/test.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh index e247694f01..8ae02e61ac 100755 --- a/test/TEST-09-ISSUE-2691/test.sh +++ b/test/TEST-09-ISSUE-2691/test.sh @@ -18,12 +18,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 } |