summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2015-11-25 17:51:17 +0000
committerEvgeny Vereshchagin <evvers@ya.ru>2015-11-25 17:51:17 +0000
commitcd949ee7348982d90fb8bdf4a37128928b82925f (patch)
tree07c2a47e404d7d3424f1c4be0c815c10eb6fee4e
parentaf143e3b692fbba2e68efd2c834711ba518f547a (diff)
tests: don't run tests on incomplete setup
-rwxr-xr-xtest/TEST-01-BASIC/test.sh2
-rwxr-xr-xtest/TEST-02-CRYPTSETUP/test.sh2
-rwxr-xr-xtest/TEST-03-JOBS/test.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 6ad2f3402b..6963d8c88d 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 8ed39b118a..dada99df59 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 41e02e2c8a..83393435f0 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"