diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2015-11-08 22:00:34 +0000 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2015-11-10 18:01:15 +0000 |
| commit | 5c404f1ab8e96efedb983806443ca982a1b2a372 (patch) | |
| tree | 4183825be3d59b298243ae1bb513190462f8a514 /test/test-functions | |
| parent | 2933d599c242ebfc70ddcffe59163916b02270f1 (diff) | |
| download | systemd-5c404f1ab8e96efedb983806443ca982a1b2a372.tar.gz systemd-5c404f1ab8e96efedb983806443ca982a1b2a372.tar.bz2 systemd-5c404f1ab8e96efedb983806443ca982a1b2a372.zip | |
tests: various fixes
* remove journal flushing (systemd-journal-flush.service runs journalctl --flush on boot)
* use sh -c and PATH instead of @SYSTEMCTL@ expansion
* remove unnecessary semicolons etc
Diffstat (limited to 'test/test-functions')
| -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 ab77576573..2f5ec9b93f 100644 --- a/test/test-functions +++ b/test/test-functions @@ -305,7 +305,7 @@ install_terminfo() { setup_testsuite() { cp $TEST_BASE_DIR/testsuite.target $initdir/etc/systemd/system/ - sed "s#@SYSTEMCTL@#$(type -P systemctl)#g" $TEST_BASE_DIR/end.service.in > $initdir/etc/systemd/system/end.service + cp $TEST_BASE_DIR/end.service $initdir/etc/systemd/system/ mkdir -p $initdir/etc/systemd/system/testsuite.target.wants ln -fs $TEST_BASE_DIR/testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service |