diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-27 12:22:12 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-27 12:22:12 +0100 |
| commit | c9ff64f7256d86e521cccef9c9a077b278b7a946 (patch) | |
| tree | c8dd8c9e58e99957f63532b985b3eba151dcd7ed | |
| parent | ff7d5a5c7c9faa553a24861db4bf531560df9c0d (diff) | |
| parent | cd949ee7348982d90fb8bdf4a37128928b82925f (diff) | |
Merge pull request #2030 from evverx/dont-run-tests-on-incomplete-setup
tests: don't run tests on incomplete setup
| -rwxr-xr-x | test/TEST-01-BASIC/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-02-CRYPTSETUP/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-03-JOBS/test.sh | 2 |
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" |