chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tests: add test-path
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 3119a95dad28b361fd14a2064956dd6320401ea8..698a7b0f3f68decda5b63d195f84086a4d74434f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,16 +39,16 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=6
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
-LIBSYSTEMD_CURRENT=4
+LIBSYSTEMD_CURRENT=5
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=4
+LIBSYSTEMD_AGE=5
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -250,6 +250,7 @@ SOCKETS_TARGET_WANTS =
 BUSNAMES_TARGET_WANTS =
 TIMERS_TARGET_WANTS =
 USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
 USER_BUSNAMES_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
@@ -270,6 +271,7 @@ install-target-wants-hook:
        what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
        what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
        what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+       what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
 
 install-busnames-target-wants-hook:
        what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
@@ -738,19 +740,20 @@ noinst_LTLIBRARIES += \
 
 libsystemd_shared_la_SOURCES = \
        src/shared/linux/auto_dev-ioctl.h \
-       src/shared/linux/fanotify.h \
        src/shared/ioprio.h \
        src/shared/missing.h \
        src/shared/initreq.h \
        src/shared/securebits.h \
        src/shared/special.h \
        src/shared/list.h \
+       src/shared/unaligned.h \
        src/shared/macro.h \
        src/shared/def.h \
        src/shared/sparse-endian.h \
        src/shared/refcnt.h \
        src/shared/udev-util.h \
        src/shared/bus-errors.h \
+       src/shared/bus-errors.c \
        src/shared/device-nodes.c \
        src/shared/device-nodes.h \
        src/shared/util.c \
@@ -767,11 +770,12 @@ libsystemd_shared_la_SOURCES = \
        src/shared/time-util.h \
        src/shared/locale-util.c \
        src/shared/locale-util.h \
+       src/shared/mempool.c \
+       src/shared/mempool.h \
        src/shared/hashmap.c \
        src/shared/hashmap.h \
        src/shared/siphash24.c \
        src/shared/siphash24.h \
-       src/shared/set.c \
        src/shared/set.h \
        src/shared/fdset.c \
        src/shared/fdset.h \
@@ -857,8 +861,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/audit.h \
        src/shared/xml.c \
        src/shared/xml.h \
-       src/shared/condition-util.c \
-       src/shared/condition-util.h \
+       src/shared/condition.c \
+       src/shared/condition.h \
        src/shared/bus-label.c \
        src/shared/bus-label.h \
        src/shared/gpt.h \
@@ -878,12 +882,10 @@ libsystemd_shared_la_SOURCES = \
        src/shared/copy.h \
        src/shared/base-filesystem.c \
        src/shared/base-filesystem.h \
-       src/shared/memfd.c \
-       src/shared/memfd.h \
+       src/shared/memfd-util.c \
+       src/shared/memfd-util.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
-       src/shared/switch-root.h \
-       src/shared/switch-root.c \
        src/shared/nss-util.h
 
 if HAVE_UTMP
@@ -931,6 +933,8 @@ libsystemd_label_la_SOURCES = \
        src/shared/mkdir-label.c \
        src/shared/ask-password-api.c \
        src/shared/ask-password-api.h \
+       src/shared/switch-root.h \
+       src/shared/switch-root.c \
        src/shared/fileio-label.c \
        src/shared/fileio-label.h \
        src/shared/dev-setup.c \
@@ -1128,8 +1132,6 @@ libsystemd_core_la_SOURCES = \
        src/core/mount-setup.h \
        src/core/loopback-setup.h \
        src/core/loopback-setup.c \
-       src/core/condition.c \
-       src/core/condition.h \
        src/core/namespace.c \
        src/core/namespace.h \
        src/core/build.h \
@@ -1319,6 +1321,7 @@ tests += \
        test-env-replace \
        test-strbuf \
        test-strv \
+       test-path \
        test-path-util \
        test-strxcpyx \
        test-unit-name \
@@ -1344,6 +1347,7 @@ tests += \
        test-hashmap \
        test-set \
        test-list \
+       test-unaligned \
        test-tables \
        test-device-nodes \
        test-xml \
@@ -1354,9 +1358,11 @@ tests += \
        test-capability \
        test-async \
        test-ratelimit \
-       test-condition-util \
+       test-condition \
        test-uid-range \
-       test-bus-policy
+       test-bus-policy \
+       test-locale-util \
+       test-copy
 
 EXTRA_DIST += \
        test/a.service \
@@ -1500,13 +1506,26 @@ test_async_SOURCES = \
 test_async_LDADD = \
        libsystemd-shared.la
 
-test_condition_util_SOURCES = \
-       src/test/test-condition-util.c
+test_locale_util_SOURCES = \
+       src/test/test-locale-util.c
 
-test_condition_util_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+test_locale_util_LDADD = \
+       libsystemd-shared.la
+
+test_copy_SOURCES = \
+       src/test/test-copy.c
+
+test_copy_LDADD = \
+       libsystemd-shared.la
 
+test_condition_SOURCES = \
+       src/test/test-condition.c
+
+test_condition_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-internal.la \
+       libsystemd-capability.la \
+       libsystemd-label.la
 
 test_fdset_SOURCES = \
        src/test/test-fdset.c
@@ -1524,6 +1543,7 @@ test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
+       -lm \
        libsystemd-core.la
 
 test_uid_range_SOURCES = \
@@ -1568,8 +1588,27 @@ test_namespace_SOURCES = \
 test_namespace_LDADD = \
        libsystemd-core.la
 
+CLEANFILES += \
+       src/test/test-hashmap-ordered.c
+
+BUILT_SOURCES += \
+       src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+                          { if (!match($$0, "^#include"))          \
+                                gsub(/hashmap/, "ordered_hashmap"); \
+                            gsub(/HASHMAP/, "ORDERED_HASHMAP");     \
+                            gsub(/Hashmap/, "OrderedHashmap");      \
+                            print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+       src/test/test-hashmap-ordered.c
+
 test_hashmap_SOURCES = \
-       src/test/test-hashmap.c
+       src/test/test-hashmap.c \
+       src/test/test-hashmap-plain.c
 
 test_hashmap_LDADD = \
        libsystemd-core.la
@@ -1589,6 +1628,12 @@ test_xml_LDADD = \
 test_list_SOURCES = \
        src/test/test-list.c
 
+test_unaligned_LDADD = \
+       libsystemd-core.la
+
+test_unaligned_SOURCES = \
+       src/test/test-unaligned.c
+
 test_list_LDADD = \
        libsystemd-core.la
 
@@ -1765,6 +1810,15 @@ test_path_util_SOURCES = \
 test_path_util_LDADD = \
        libsystemd-shared.la
 
+test_path_SOURCES = \
+       src/test/test-path.c
+
+test_path_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_path_LDADD = \
+       libsystemd-core.la
+
 test_strxcpyx_SOURCES = \
        src/test/test-strxcpyx.c
 
@@ -2571,8 +2625,7 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-network/network-util.c
 
 nodist_libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym \
-       src/libsystemd/sd-bus/bus-error-mapping.c
+       src/libsystemd/libsystemd.sym
 
 libsystemd_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2610,13 +2663,11 @@ noinst_LTLIBRARIES += \
 EXTRA_DIST += \
        src/libsystemd/libsystemd.sym.m4 \
        src/libsystemd/libsystemd.pc.in \
-       src/libsystemd/sd-bus/bus-error-mapping.gperf \
        src/libsystemd/sd-bus/DIFFERENCES \
        src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
-       src/libsystemd/libsystemd.sym \
-       src/libsystemd/sd-bus/bus-error-mapping.c
+       src/libsystemd/libsystemd.sym
 
 BUILT_SOURCES += \
        src/libsystemd/libsystemd.sym
@@ -2917,6 +2968,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-icmp6-nd.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
+       src/systemd/sd-pppoe.h \
        src/libsystemd-network/sd-dhcp-client.c \
        src/libsystemd-network/sd-dhcp-server.c \
        src/libsystemd-network/dhcp-network.c \
@@ -2931,6 +2983,7 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/ipv4ll-network.c \
        src/libsystemd-network/ipv4ll-packet.c \
        src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
        src/libsystemd-network/sd-icmp6-nd.c \
@@ -2990,6 +3043,14 @@ test_ipv4ll_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_pppoe_SOURCES = \
+       src/systemd/sd-pppoe.h \
+       src/libsystemd-network/test-pppoe.c
+
+test_pppoe_LDADD = \
+       libsystemd-network.la \
+       libsystemd-shared.la
+
 test_icmp6_rs_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-icmp6-nd.h \
@@ -3019,6 +3080,9 @@ tests += \
        test-icmp6-rs \
        test-dhcp6-client
 
+manual_tests += \
+       test-pppoe
+
 # ------------------------------------------------------------------------------
 if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
@@ -3035,6 +3099,15 @@ noinst_PROGRAMS += \
 dist_pkgdata_DATA += \
        src/libsystemd-terminal/unifont-glyph-array.bin
 
+nodist_userunit_DATA += \
+       units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+       systemd-consoled.service
+
+EXTRA_DIST += \
+       units/user/systemd-consoled.service.in
+
 tests += \
        test-term-page \
        test-term-parser \
@@ -3423,7 +3496,8 @@ systemd_udevd_SOURCES = \
        src/udev/udevd.c
 
 systemd_udevd_LDADD = \
-       libudev-core.la
+       libudev-core.la \
+       libsystemd-capability.la
 
 udevadm_SOURCES = \
        src/udev/udevadm.c \
@@ -3437,7 +3511,8 @@ udevadm_SOURCES = \
        src/udev/udevadm-test-builtin.c
 
 udevadm_LDADD = \
-       libudev-core.la
+       libudev-core.la \
+       libsystemd-capability.la
 
 # Update hwdb on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
@@ -3471,7 +3546,8 @@ test_udev_SOURCES = \
        src/test/test-udev.c
 
 test_udev_LDADD = \
-       libudev-core.la \
+       libudev-core.la  \
+       libsystemd-capability.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS) \
        $(SELINUX_LIBS)
@@ -4010,6 +4086,8 @@ libsystemd_journal_core_la_SOURCES = \
        src/journal/journald-wall.h \
        src/journal/journald-native.c \
        src/journal/journald-native.h \
+       src/journal/journald-audit.c \
+       src/journal/journald-audit.h \
        src/journal/journald-rate-limit.c \
        src/journal/journald-rate-limit.h \
        src/journal/journal-internal.h
@@ -4161,7 +4239,8 @@ bin_PROGRAMS += \
 
 dist_systemunit_DATA += \
        units/systemd-journald.socket \
-       units/systemd-journald-dev-log.socket
+       units/systemd-journald-dev-log.socket \
+       units/systemd-journald-audit.socket
 
 nodist_systemunit_DATA += \
        units/systemd-journald.service \
@@ -4180,7 +4259,8 @@ dist_catalog_DATA = \
 
 SOCKETS_TARGET_WANTS += \
        systemd-journald.socket \
-       systemd-journald-dev-log.socket
+       systemd-journald-dev-log.socket \
+       systemd-journald-audit.socket
 
 SYSINIT_TARGET_WANTS += \
        systemd-journald.service \
@@ -4371,6 +4451,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-vconsole-setup.service
 
+dist_udevrules_DATA += \
+       src/vconsole/90-vconsole.rules
+
 SYSINIT_TARGET_WANTS += \
        systemd-vconsole-setup.service
 endif
@@ -5138,11 +5221,9 @@ networkctl_LDADD = \
 test_network_SOURCES = \
        src/network/test-network.c
 
-test_network_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_network_LDADD = \
-       libsystemd-networkd-core.la
+       libsystemd-networkd-core.la \
+       libsystemd-capability.la
 
 test_network_tables_SOURCES = \
        src/network/test-network-tables.c \
@@ -5369,20 +5450,6 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
        org.freedesktop.login1.busname
 
-if ENABLE_MULTI_SEAT_X
-
-systemd_multi_seat_x_SOURCES = \
-       src/login/multi-seat-x.c
-
-systemd_multi_seat_x_LDADD = \
-       libsystemd-label.la \
-       libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
-       systemd-multi-seat-x
-
-endif
-
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
        src/login/70-power-switch.rules
@@ -6231,3 +6298,6 @@ print-%:
 
 git-contrib:
        @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+        tools/gdb-sd_dump_hashmaps.py
Unnamed repository; edit this file 'description' to name the repository.