summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2018-07-05 18:30:52 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-07-18 02:56:23 +0200
commit57916ea352b85153ecbed803d52861ca8b933dd3 (patch)
treeb07faa6900bbc95b00b05c4719bb01aea82889dc /test
parenttests: use the asan wrapper to boot a VM/container if systemd is built with ASAN (diff)
downloadsystemd-57916ea352b85153ecbed803d52861ca8b933dd3.tar.xz
systemd-57916ea352b85153ecbed803d52861ca8b933dd3.zip
tests: allow passing additional arguments to nspawn via NSPAWN_ARGUMENTS
Diffstat (limited to 'test')
-rw-r--r--test/test-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions
index f3263411b0..accaf927c8 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -190,7 +190,7 @@ $KERNEL_APPEND \
run_nspawn() {
[[ -d /run/systemd/system ]] || return 1
- local _nspawn_cmd="$BUILD_DIR/systemd-nspawn --register=no --kill-signal=SIGKILL --directory=$TESTDIR/nspawn-root $PATH_TO_INIT $KERNEL_APPEND"
+ local _nspawn_cmd="$BUILD_DIR/systemd-nspawn $NSPAWN_ARGUMENTS --register=no --kill-signal=SIGKILL --directory=$TESTDIR/nspawn-root $PATH_TO_INIT $KERNEL_APPEND"
if [[ "$NSPAWN_TIMEOUT" != "infinity" ]]; then
_nspawn_cmd="timeout --foreground $NSPAWN_TIMEOUT $_nspawn_cmd"
fi