diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-21 19:55:54 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-04-13 11:34:48 +0200 |
| commit | 7ce49e656b1377713ade999dfe381807a78313cd (patch) | |
| tree | 09447767663baf33bc48b7243fa438997d11afea /test | |
| parent | 5396624506e155c4bc10c0ee65b939600860ab67 (diff) | |
| download | systemd-7ce49e656b1377713ade999dfe381807a78313cd.tar.gz | |
test: add test for prefix unit loading
Diffstat (limited to 'test')
| -rw-r--r-- | test/meson.build | 13 | ||||
| -rw-r--r-- | test/unit-.service.d/10-override.conf | 2 | ||||
| -rw-r--r-- | test/unit-with-.service.d/20-override.conf | 2 | ||||
| -rw-r--r-- | test/unit-with-multiple-.service.d/20-override.conf | 2 | ||||
| -rw-r--r-- | test/unit-with-multiple-.service.d/30-override.conf | 2 | ||||
| -rw-r--r-- | test/unit-with-multiple-dashes.service | 6 | ||||
| -rw-r--r-- | test/unit-with-multiple-dashes.service.d/10-override.conf | 2 |
7 files changed, 25 insertions, 4 deletions
diff --git a/test/meson.build b/test/meson.build index 0bd45cd891..c112e09577 100644 --- a/test/meson.build +++ b/test/meson.build @@ -158,13 +158,18 @@ test_data_files = ''' test-path/path-unit.path test-path/paths.target test-path/sysinit.target - testsuite.target - timers.target - unstoppable.service test-umount/empty.mountinfo + test-umount/example.swaps test-umount/garbled.mountinfo test-umount/rhbug-1554943.mountinfo - test-umount/example.swaps + testsuite.target + timers.target + unit-with-.service.d/20-override.conf + unit-with-multiple-.service.d/20-override.conf + unit-with-multiple-.service.d/30-override.conf + unit-with-multiple-dashes.service + unit-with-multiple-dashes.service.d/10-override.conf + unstoppable.service '''.split() if conf.get('ENABLE_RESOLVE') == 1 diff --git a/test/unit-.service.d/10-override.conf b/test/unit-.service.d/10-override.conf new file mode 100644 index 0000000000..916737d415 --- /dev/null +++ b/test/unit-.service.d/10-override.conf @@ -0,0 +1,2 @@ +[Unit] +Description=override0 diff --git a/test/unit-with-.service.d/20-override.conf b/test/unit-with-.service.d/20-override.conf new file mode 100644 index 0000000000..c6c2438f73 --- /dev/null +++ b/test/unit-with-.service.d/20-override.conf @@ -0,0 +1,2 @@ +[Unit] +Documentation=man:override1 diff --git a/test/unit-with-multiple-.service.d/20-override.conf b/test/unit-with-multiple-.service.d/20-override.conf new file mode 100644 index 0000000000..62fafd2e3b --- /dev/null +++ b/test/unit-with-multiple-.service.d/20-override.conf @@ -0,0 +1,2 @@ +[Unit] +Documentation=man:override2 diff --git a/test/unit-with-multiple-.service.d/30-override.conf b/test/unit-with-multiple-.service.d/30-override.conf new file mode 100644 index 0000000000..b9616da8a8 --- /dev/null +++ b/test/unit-with-multiple-.service.d/30-override.conf @@ -0,0 +1,2 @@ +[Unit] +Documentation=man:override3 diff --git a/test/unit-with-multiple-dashes.service b/test/unit-with-multiple-dashes.service new file mode 100644 index 0000000000..b38b3604b8 --- /dev/null +++ b/test/unit-with-multiple-dashes.service @@ -0,0 +1,6 @@ +[Unit] +Description=A unit with multiple dashes +Documentation=man:test + +[Service] +ExecStart=/bin/true diff --git a/test/unit-with-multiple-dashes.service.d/10-override.conf b/test/unit-with-multiple-dashes.service.d/10-override.conf new file mode 100644 index 0000000000..982c3621a6 --- /dev/null +++ b/test/unit-with-multiple-dashes.service.d/10-override.conf @@ -0,0 +1,2 @@ +[Unit] +Description=override4 |