diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2023-08-28 13:49:06 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2023-08-28 13:49:06 +0200 |
| commit | f957e45d9f76317bb58b6163ddb27bd874baa916 (patch) | |
| tree | eac0831b755db5afa707dd6883367fb24972873a /t/dh_installsystemd/dh_installsystemd.t | |
| parent | 259ab8a0d17d9846ae80a157b6636e9d22be131a (diff) | |
| parent | bf161bdf9cf3e48245b220c25cebd3cc58d8a820 (diff) | |
Merge vcs-git/main into dgit/sidHEADdebian/13.11.5archive/debian/13.11.5master
Thie merges the maintainer history so far into the dgit tree and
hopefully enables me to push it.
Diffstat (limited to 't/dh_installsystemd/dh_installsystemd.t')
| -rwxr-xr-x | t/dh_installsystemd/dh_installsystemd.t | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/t/dh_installsystemd/dh_installsystemd.t b/t/dh_installsystemd/dh_installsystemd.t index bbb4eb0d..cb1a3dab 100755 --- a/t/dh_installsystemd/dh_installsystemd.t +++ b/t/dh_installsystemd/dh_installsystemd.t @@ -105,6 +105,7 @@ each_compat_subtest { unit_is_started('foo', 'foo2', 0); ok(run_dh_tool('dh_clean')); + # Install unit directly below /lib make_path('debian/foo/lib/systemd/system/'); copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/foo2.service'); ok(run_dh_tool('dh_installsystemd')); @@ -116,27 +117,11 @@ each_compat_subtest { unit_is_started('foo', 'foo2', 1); ok(run_dh_tool('dh_clean')); - - # lib -> usr/lib (if we ever support that) - make_path('debian/foo/lib/systemd/system/'); - copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/foo2.service'); - ok(run_dh_tool('dh_installsystemd')); - ok(-e 'debian/foo/lib/systemd/system/foo2.service'); - ok(find_script('foo', 'postinst')); - unit_is_enabled('foo', 'foo', 1); - unit_is_started('foo', 'foo', 1); - unit_is_enabled('foo', 'foo2', 1); - unit_is_started('foo', 'foo2', 1); - ok(run_dh_tool('dh_clean')); - - # lib -> usr/lib with both no-empty (if we ever suport that) - make_path('debian/foo/lib/systemd/system/'); - make_path('debian/foo/lib/systemd/system/'); - copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/foo2.service'); - copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/bar.service'); + # Install unit directly below /usr/lib + make_path('debian/foo/usr/lib/systemd/system/'); + copy_file('debian/foo2.service', 'debian/foo/usr/lib/systemd/system/foo2.service'); ok(run_dh_tool('dh_installsystemd')); - ok(-e 'debian/foo/lib/systemd/system/bar.service'); - ok(-e 'debian/foo/lib/systemd/system/foo2.service'); + ok(-e 'debian/foo/usr/lib/systemd/system/foo2.service'); ok(find_script('foo', 'postinst')); unit_is_enabled('foo', 'foo', 1); unit_is_started('foo', 'foo', 1); |