summaryrefslogtreecommitdiff
path: root/test/TEST-07-ISSUE-1981
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-09 02:37:33 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-09 02:37:33 -0400
commitf6e7ffdf3fe8e3ed5e659f747946461350ade5a8 (patch)
treed261964cafdd51154b1ad757574f508da2d9ad76 /test/TEST-07-ISSUE-1981
parent566cac15ed36506e2bb766313a5d4e0825bc6499 (diff)
parent022ed72eff07ca6c1409747e774ef5b35724c9df (diff)
Merge tag 'v230-3.parabola1' into parabola
Diffstat (limited to 'test/TEST-07-ISSUE-1981')
-rwxr-xr-xtest/TEST-07-ISSUE-1981/test.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh
index dcb6ece4d4..d97c4ec27d 100755
--- a/test/TEST-07-ISSUE-1981/test.sh
+++ b/test/TEST-07-ISSUE-1981/test.sh
@@ -8,7 +8,8 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/1981"
test_run() {
dwarn "skipping QEMU"
if check_nspawn; then
- timeout --foreground 30s systemd-nspawn --kill-signal=SIGKILL --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND
+ NSPAWN_TIMEOUT=30s
+ run_nspawn
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"