From b8180852d7b855c548ebac0af7bfb74ec5dbcd6e Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Dec 15 2020 09:45:30 +0000 Subject: tests: allow passing additional arguments to nspawn via NSPAWN_ARGUMENTS (cherry picked from commit 57916ea352b85153ecbed803d52861ca8b933dd3) patch_name: 0103-tests-allow-passing-additional-arguments-to-nspawn-v.patch present_in_specfile: true location_in_specfile: 103 squash_commits: true --- diff --git a/test/test-functions b/test/test-functions index 76eef8a..8164858 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