diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-20 19:15:09 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-28 11:46:48 +0100 |
| commit | 07d16f438a196712299a0509ecd4ae8966493e2d (patch) | |
| tree | 941d2ae05524e7fad1a19b01df542b18f13faadd /test | |
| parent | d0ac89a1e8bd0b434eaa68aa010ebc1bc621c5fb (diff) | |
| download | systemd-07d16f438a196712299a0509ecd4ae8966493e2d.tar.gz | |
test: move TEST-44-* to static files
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-44-LOG-NAMESPACE/test.sh | 21 | ||||
| -rw-r--r-- | test/units/testsuite-44.service | 11 | ||||
| -rwxr-xr-x | test/units/testsuite-44.sh (renamed from test/TEST-44-LOG-NAMESPACE/testsuite.sh) | 0 |
3 files changed, 12 insertions, 20 deletions
diff --git a/test/TEST-44-LOG-NAMESPACE/test.sh b/test/TEST-44-LOG-NAMESPACE/test.sh index c2070f2b61..2ef0c244ac 100755 --- a/test/TEST-44-LOG-NAMESPACE/test.sh +++ b/test/TEST-44-LOG-NAMESPACE/test.sh @@ -12,28 +12,9 @@ test_setup() { eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) setup_basic_environment - mask_supporting_services - - # setup the testsuite service - cat >$initdir/etc/systemd/system/testsuite.service <<EOF -[Unit] -Description=Testsuite service -Before=getty-pre.target -Wants=getty-pre.target -Wants=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket -After=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket - -[Service] -ExecStart=/testsuite.sh -Type=oneshot -LogTarget=foobar -EOF - cp testsuite.sh $initdir/ - - setup_testsuite ) setup_nspawn_root } -do_test "$@" +do_test "$@" 44 diff --git a/test/units/testsuite-44.service b/test/units/testsuite-44.service new file mode 100644 index 0000000000..1211ea3eab --- /dev/null +++ b/test/units/testsuite-44.service @@ -0,0 +1,11 @@ +[Unit] +Description=TESTSUITE-44-LOG-NAMESPACE +Before=getty-pre.target +Wants=getty-pre.target +Wants=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket +After=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket + +[Service] +ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +Type=oneshot +LogTarget=foobar diff --git a/test/TEST-44-LOG-NAMESPACE/testsuite.sh b/test/units/testsuite-44.sh index 97541634d0..97541634d0 100755 --- a/test/TEST-44-LOG-NAMESPACE/testsuite.sh +++ b/test/units/testsuite-44.sh |