From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Wed, 25 Nov 2015 17:51:17 +0000 (+0000)
Subject: tests: don't run tests on incomplete setup
X-Git-Tag: v229~260^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd949ee7348982d90fb8bdf4a37128928b82925f;p=thirdparty%2Fsystemd.git

tests: don't run tests on incomplete setup
---

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 6ad2f3402b2..6963d8c88df 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -58,7 +58,7 @@ Type=oneshot
 EOF
 
         setup_testsuite
-    )
+    ) || return 1
     setup_nspawn_root
 
     # mask some services that we do not want to run in these tests
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
index 8ed39b118af..dada99df59a 100755
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@@ -76,7 +76,7 @@ EOF
         cat >>$initdir/etc/fstab <<EOF
 /dev/mapper/varcrypt    /var    ext3    defaults 0 1
 EOF
-    )
+    ) || return 1
     setup_nspawn_root
 
     ddebug "umount $TESTDIR/root/var"
diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
index 41e02e2c8ac..83393435f0a 100755
--- a/test/TEST-03-JOBS/test.sh
+++ b/test/TEST-03-JOBS/test.sh
@@ -63,7 +63,7 @@ EOF
         cp test-jobs.sh $initdir/
 
         setup_testsuite
-    )
+    ) || return 1
     setup_nspawn_root
 
     ddebug "umount $TESTDIR/root"