diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-19 11:35:01 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-05-30 07:49:46 +0200 |
| commit | 5e7c94d0ff790aee82d5cbf934a6a440aeca6f42 (patch) | |
| tree | ef061f26378492d8490bad14ab273517f51fc7cc /src/test | |
| parent | 7b0acd5d3752492b8fb182c59976fd1a0ee61031 (diff) | |
meson: rename libsystemd_internal to libsystem_static
We already use the "_static" suffix for libshared_static ("shared" is the name
of the library, "static" is the format) and other libs, so let's rename for
consistency.
Also change libsystemd_static_sources to libsystemd_sources, since the same
list is used for both and shorter is better.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/meson.build | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/test/meson.build b/src/test/meson.build index fab9c4215..2d88a8716 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -40,8 +40,8 @@ generate_sym_test_py = find_program('generate-sym-test.py') test_libelogind_sym_c = custom_target( 'test-libelogind-sym.c', - output : 'test-libelogind-sym.c', input : [libelogind_sym_path] + systemd_headers, + output : 'test-libelogind-sym.c', command : [generate_sym_test_py, libelogind_sym_path] + systemd_headers, capture : true) @@ -59,8 +59,8 @@ test_dlopen_c = files('test-dlopen.c') ############################################################ #if 0 /// UNNEEDED by elogind -# test_elogind_tmpfiles_py = find_program('test-elogind-tmpfiles.py') #endif // 0 +test_elogind_tmpfiles_py = find_program('test-elogind-tmpfiles.py') ############################################################ @@ -74,7 +74,7 @@ tests += [ # 'src/test/test-helper.c'], # [libcore, # libudev, -# libelogind_internal], +# libsystemd_static], # [threads, # librt, # libseccomp, @@ -832,7 +832,7 @@ tests += [ [['src/libelogind/sd-bus/test-bus-error.c'], [libshared_static, - libelogind_internal], + libelogind_static], []], #if 0 /// UNNEEDED in elogind @@ -919,22 +919,22 @@ tests += [ #if 0 /// UNNEEDED in elogind # tests += [ -# [['src/libelogind-network/test-dhcp-option.c', -# 'src/libelogind-network/dhcp-protocol.h', -# 'src/libelogind-network/dhcp-internal.h'], +# [['src/libsystemd-network/test-dhcp-option.c', +# 'src/libsystemd-network/dhcp-protocol.h', +# 'src/libsystemd-network/dhcp-internal.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-sd-dhcp-lease.c', -# 'src/libelogind-network/dhcp-lease-internal.h'], +# [['src/libsystemd-network/test-sd-dhcp-lease.c', +# 'src/libsystemd-network/dhcp-lease-internal.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-dhcp-client.c', -# 'src/libelogind-network/dhcp-protocol.h', -# 'src/libelogind-network/dhcp-internal.h', +# [['src/libsystemd-network/test-dhcp-client.c', +# 'src/libsystemd-network/dhcp-protocol.h', +# 'src/libsystemd-network/dhcp-internal.h', # 'src/systemd/sd-dhcp-client.h'], # [libshared, # libelogind_network], @@ -945,8 +945,8 @@ tests += [ # libelogind_network], # []], # -# [['src/libelogind-network/test-ipv4ll.c', -# 'src/libelogind-network/arp-util.h', +# [['src/libsystemd-network/test-ipv4ll.c', +# 'src/libsystemd-network/arp-util.h', # 'src/systemd/sd-ipv4ll.h'], # [libshared, # libelogind_network], @@ -966,27 +966,27 @@ tests += [ # [], # '', 'manual'], # -# [['src/libelogind-network/test-ndisc-rs.c', -# 'src/libelogind-network/dhcp-identifier.h', -# 'src/libelogind-network/dhcp-identifier.c', -# 'src/libelogind-network/icmp6-util.h', +# [['src/libsystemd-network/test-ndisc-rs.c', +# 'src/libsystemd-network/dhcp-identifier.h', +# 'src/libsystemd-network/dhcp-identifier.c', +# 'src/libsystemd-network/icmp6-util.h', # 'src/systemd/sd-dhcp6-client.h', # 'src/systemd/sd-ndisc.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-ndisc-ra.c', -# 'src/libelogind-network/icmp6-util.h', +# [['src/libsystemd-network/test-ndisc-ra.c', +# 'src/libsystemd-network/icmp6-util.h', # 'src/systemd/sd-ndisc.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-dhcp6-client.c', -# 'src/libelogind-network/dhcp-identifier.h', -# 'src/libelogind-network/dhcp-identifier.c', -# 'src/libelogind-network/dhcp6-internal.h', +# [['src/libsystemd-network/test-dhcp6-client.c', +# 'src/libsystemd-network/dhcp-identifier.h', +# 'src/libsystemd-network/dhcp-identifier.c', +# 'src/libsystemd-network/dhcp6-internal.h', # 'src/systemd/sd-dhcp6-client.h'], # [libshared, # libelogind_network], |