diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2018-07-05 16:30:52 +0000 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-03-10 13:30:51 +0100 |
| commit | 164ead52f895785e0461ef205c5be317b400b0ff (patch) | |
| tree | 5ae6760d6f5310ace16d4b5678646f86af9b9a82 | |
| parent | 26b213f1dc3d869bc8b22607b2e1b5f27717ddc1 (diff) | |
| download | systemd-164ead52f895785e0461ef205c5be317b400b0ff.tar.gz | |
tests: allow passing additional arguments to nspawn via NSPAWN_ARGUMENTS
(cherry picked from commit 57916ea352b85153ecbed803d52861ca8b933dd3)
| -rw-r--r-- | test/test-functions | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index 76eef8aa4d..8164858c2a 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 |