summaryrefslogtreecommitdiff
path: root/test/TEST-04-JOURNAL
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-06-24 16:23:39 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2016-06-24 16:23:39 +0200
commit7cad32bbdeed20ac0daf6049ab093db902f4a4e7 (patch)
tree44fffa4c1d97541b33463e6c27929860bd09ea94 /test/TEST-04-JOURNAL
parentb2ecd099dc7371aafb988145ab40a631f7050d41 (diff)
downloadsystemd-7cad32bbdeed20ac0daf6049ab093db902f4a4e7.tar.gz
test: merge check_nspawn() into run_nspawn()
This makes nspawn tests symmetric with run_qemu() which also exits with 1 if QEMU is not available.
Diffstat (limited to 'test/TEST-04-JOURNAL')
-rwxr-xr-xtest/TEST-04-JOURNAL/test.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
index 1a14f76060..3ccf113019 100755
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@@ -25,8 +25,7 @@ test_run() {
else
dwarn "can't run QEMU, skipping"
fi
- if check_nspawn; then
- run_nspawn
+ if run_nspawn; then
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"