summaryrefslogtreecommitdiff
path: root/test/TEST-12-ISSUE-3171/test.sh
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2016-06-24 19:44:18 +0300
committerGitHub <noreply@github.com>2016-06-24 19:44:18 +0300
commitd946fb596f7ed010dce6685a499e0aebef00e451 (patch)
treefcf9d56b1f966f421e639c63b41c3edc3c657817 /test/TEST-12-ISSUE-3171/test.sh
parent6edefe0b064e57af108f56172b3dafa0be61e234 (diff)
parent7cad32bbdeed20ac0daf6049ab093db902f4a4e7 (diff)
Merge pull request #3587 from martinpitt/master
Fix some test issues
Diffstat (limited to 'test/TEST-12-ISSUE-3171/test.sh')
-rwxr-xr-xtest/TEST-12-ISSUE-3171/test.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh
index 925dcad9ea..e20f470143 100755
--- a/test/TEST-12-ISSUE-3171/test.sh
+++ b/test/TEST-12-ISSUE-3171/test.sh
@@ -6,8 +6,11 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3171"
. $TEST_BASE_DIR/test-functions
test_run() {
- run_nspawn || return 1
- check_result_nspawn || return 1
+ if run_nspawn; then
+ check_result_nspawn || return 1
+ else
+ dwarn "can't run systemd-nspawn, skipping"
+ fi
return 0
}