diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2016-04-13 16:57:06 +0300 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-13 09:57:06 -0400 |
| commit | 43bbb8f005177bcad135ec894419361f0f420034 (patch) | |
| tree | 7dc3a0971b7413e095852fa2643022e5e29cccdb /test/TEST-07-ISSUE-1981 | |
| parent | 025ef1d2264b24e77283d312dede8af01fa050f6 (diff) | |
tests: don't rely on the host's systemd-nspawn, don't register test machine (#3023)
Fixes:
$ cd test/TEST-07-ISSUE-1981/
$ sudo make clean setup run
...
timeout: failed to run command ‘systemd-nspawn’: No such file or directory
...
TEST RUN: https://github.com/systemd/systemd/issues/1981 [FAILED]
Makefile:10: recipe for target 'run' failed
make: *** [run] Error 1
Diffstat (limited to 'test/TEST-07-ISSUE-1981')
| -rwxr-xr-x | test/TEST-07-ISSUE-1981/test.sh | 3 |
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" |