diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-28 20:03:37 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-29 16:17:57 +0200 |
| commit | 2a2d002fb0913fe931b4ac903ca425a725aa79c0 (patch) | |
| tree | f0a09a6d7f2b70ccb348d404ea88385a800067ce /meson.build | |
| parent | test-systemctl-enable: use magic syntax to allow inverted tests (diff) | |
| download | systemd-2a2d002fb0913fe931b4ac903ca425a725aa79c0.tar.xz systemd-2a2d002fb0913fe931b4ac903ca425a725aa79c0.zip | |
test-systemctl-enable: also use freshly-built systemd-id128
Tests were failing on centos7 because systemd-id128 is not in path.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 33caaec56c..f17a920a81 100644 --- a/meson.build +++ b/meson.build @@ -2446,7 +2446,7 @@ public_programs += executable( install_rpath : rootlibexecdir, install : true) -exe = executable( +systemctl = executable( 'systemctl', systemctl_sources, include_directories : includes, @@ -2460,13 +2460,7 @@ exe = executable( install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) -public_programs += exe -if want_tests != 'false' - test('test-systemctl-enable', - test_systemctl_enable_sh, - # https://github.com/mesonbuild/meson/issues/2681 - args : exe.full_path()) -endif +public_programs += systemctl if conf.get('ENABLE_PORTABLED') == 1 dbus_programs += executable( @@ -3285,13 +3279,22 @@ executable( install : true, install_dir : rootlibexecdir) -public_programs += executable( +systemd_id128 = executable( 'systemd-id128', 'src/id128/id128.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true) +public_programs += systemd_id128 + +if want_tests != 'false' + test('test-systemctl-enable', + test_systemctl_enable_sh, + # https://github.com/mesonbuild/meson/issues/2681 + args : [systemctl.full_path(), + systemd_id128.full_path()]) +endif public_programs += executable( 'systemd-path', |