summaryrefslogtreecommitdiff
path: root/test/TEST-02-CRYPTSETUP
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-12-13 14:21:31 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-28 11:51:29 +0100
commitec43f6862eeafa1d737b60c8c812066f7cf1ff7a (patch)
tree8ffab03c293f46876e1d7b39491b34351b35479b /test/TEST-02-CRYPTSETUP
parenteb1290ef35af93eebb73e6f0769031382011e8ca (diff)
downloadsystemd-ec43f6862eeafa1d737b60c8c812066f7cf1ff7a.tar.gz
test: run tests directly from the loopback device
Before, we'd copy the test tree into nspawn-root, and run the tests from there. This is OK, and doesn't actually take much extra time. But it uses quite a lot of extra disk space. So let's make things a bit more efficient by running directly from the image file. We still run the unprivileged nspawn tests from a copy. Once the kernel implements fs shift, we can do away with that too.
Diffstat (limited to 'test/TEST-02-CRYPTSETUP')
-rwxr-xr-xtest/TEST-02-CRYPTSETUP/test.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
index c6e6b7e649..cdaed13047 100755
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@@ -70,8 +70,8 @@ test_cleanup() {
}
test_setup_cleanup() {
- cleanup_root_var
- _test_setup_cleanup
+ cleanup_root_var || :
+ cleanup_initdir
}
do_test "$@" 02