chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
test-hashmap.c: add unit-test for hashmap
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index eee73e59509966aeb69b30f99cd2df102ed9b982..d50ab3d704301dba334b3c015a7929d753d42b53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,28 +32,28 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=5
+LIBSYSTEMD_LOGIN_CURRENT=6
 LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=5
+LIBSYSTEMD_LOGIN_AGE=6
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=9
+LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=20
+LIBSYSTEMD_ID128_REVISION=21
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=9
+LIBSYSTEMD_JOURNAL_CURRENT=10
 LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=9
+LIBSYSTEMD_JOURNAL_AGE=10
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -124,9 +124,15 @@ dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
-noinst_tests=
-noinst_PROGRAMS = $(noinst_tests)
-TESTS = $(noinst_tests)
+tests=
+manual_tests =
+if ENABLE_TESTS
+noinst_PROGRAMS = $(manual_tests) $(tests)
+TESTS = $(tests)
+else
+noinst_PROGRAMS =
+TESTS =
+endif
 udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
@@ -325,6 +331,7 @@ systemd_analyze_LDADD = \
 dist_bashcompletion_DATA = \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
+       shell-completion/bash/systemd-analyze \
        shell-completion/bash/udevadm
 
 dist_tmpfiles_DATA = \
@@ -410,6 +417,7 @@ nodist_systemunit_DATA = \
        units/systemd-remount-fs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
+       units/systemd-tmpfiles-setup-dev.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
        units/systemd-ask-password-wall.service \
@@ -427,7 +435,6 @@ nodist_systemunit_DATA = \
        units/systemd-kexec.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
-       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -435,7 +442,8 @@ nodist_systemunit_DATA = \
        units/initrd-parse-etc.service \
        units/initrd-cleanup.service \
        units/initrd-udevadm-cleanup-db.service \
-       units/initrd-switch-root.service
+       units/initrd-switch-root.service \
+       units/systemd-nspawn@.service
 
 dist_userunit_DATA = \
        units/user/default.target \
@@ -455,6 +463,7 @@ EXTRA_DIST += \
        units/systemd-remount-fs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
+       units/systemd-tmpfiles-setup-dev.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \
        units/systemd-ask-password-wall.service.in \
@@ -469,7 +478,6 @@ EXTRA_DIST += \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
-       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -482,6 +490,7 @@ EXTRA_DIST += \
        units/initrd-cleanup.service.in \
        units/initrd-udevadm-cleanup-db.service.in \
        units/initrd-switch-root.service.in \
+       units/systemd-nspawn@.service.in \
        introspect.awk
 
 CLEANFILES += \
@@ -560,7 +569,7 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
 
@@ -680,7 +689,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/calendarspec.h \
        src/shared/fileio.c \
        src/shared/fileio.h \
-       src/shared/output-mode.h
+       src/shared/output-mode.h \
+       src/shared/MurmurHash3.c \
+       src/shared/MurmurHash3.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1061,7 +1072,7 @@ CLEANFILES += \
        src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
-noinst_PROGRAMS += \
+manual_tests += \
        test-engine \
        test-ns \
        test-loopback \
@@ -1072,7 +1083,7 @@ noinst_PROGRAMS += \
        test-watchdog \
        test-log
 
-noinst_tests += \
+tests += \
        test-job-type \
        test-env-replace \
        test-strbuf \
@@ -1091,7 +1102,8 @@ noinst_tests += \
        test-cgroup-util \
        test-prioq \
        test-fileio \
-       test-time
+       test-time \
+       test-hashmap
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1143,7 +1155,7 @@ test_hostname_LDADD = \
        libsystemd-core.la
 
 if ENABLE_EFI
-noinst_PROGRAMS += \
+manual_tests += \
        test-efivars
 
 test_efivars_SOURCES = \
@@ -1182,6 +1194,15 @@ test_util_CFLAGS = \
 test_util_LDADD = \
        libsystemd-core.la
 
+test_hashmap_SOURCES = \
+       src/test/test-hashmap.c
+
+test_hashmap_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_hashmap_LDADD = \
+       libsystemd-core.la
+
 test_prioq_SOURCES = \
        src/test/test-prioq.c
 
@@ -1711,7 +1732,10 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-type.c \
        src/libsystemd-bus/bus-type.h \
        src/libsystemd-bus/bus-match.c \
-       src/libsystemd-bus/bus-match.h
+       src/libsystemd-bus/bus-match.h \
+       src/libsystemd-bus/bus-bloom.c \
+       src/libsystemd-bus/bus-bloom.h \
+       src/libsystemd-bus/kdbus.h
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
@@ -1721,7 +1745,7 @@ libsystemd_bus_la_LIBADD =  \
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
-noinst_tests += \
+tests += \
        test-bus-marshal \
        test-bus-signature \
        test-bus-chat \
@@ -1941,13 +1965,11 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
-       units/systemd-static-nodes.service.in \
        units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service
@@ -1956,7 +1978,6 @@ SOCKETS_TARGET_WANTS += \
        systemd-udevd-control.socket \
        systemd-udevd-kernel.socket
 SYSINIT_TARGET_WANTS += \
-       systemd-static-nodes.service \
        systemd-udevd.service \
        systemd-udev-trigger.service
 
@@ -2069,7 +2090,7 @@ TESTS += \
        test/udev-test.pl \
        test/rules-test.sh
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-libudev \
        test-udev
 
@@ -2522,7 +2543,7 @@ test_id128_LDADD = \
        libsystemd-shared.la \
        libsystemd-id128-internal.la
 
-noinst_tests += \
+tests += \
        test-id128
 
 pkginclude_HEADERS += \
@@ -2830,10 +2851,10 @@ catalog-remove-hook:
 UNINSTALL_DATA_HOOKS += \
        catalog-remove-hook
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-journal-enum
 
-noinst_tests += \
+tests += \
        test-journal \
        test-journal-send \
        test-journal-syslog \
@@ -3076,7 +3097,8 @@ systemd_bootchart_SOURCES = \
        src/bootchart/svg.h
 
 systemd_bootchart_LDADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-journal.la
 
 rootlibexec_PROGRAMS += \
        systemd-bootchart
@@ -3455,8 +3477,8 @@ systemd_logind_CFLAGS = \
 
 systemd_logind_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
        libsystemd-audit.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        libsystemd-dbus.la \
        libudev.la
@@ -3530,7 +3552,7 @@ test_inhibit_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-login \
        test-inhibit
 
@@ -4009,6 +4031,7 @@ SYSINIT_TARGET_WANTS += \
        sys-kernel-config.mount \
        sys-kernel-debug.mount \
        sys-fs-fuse-connections.mount \
+       systemd-tmpfiles-setup-dev.service \
        systemd-tmpfiles-setup.service \
        systemd-sysctl.service \
        systemd-ask-password-console.path
Unnamed repository; edit this file 'description' to name the repository.