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 92bd542767cb2fbd7ea25f1eca79ee56820d7663..d50ab3d704301dba334b3c015a7929d753d42b53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,28 +32,28 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=2
-LIBSYSTEMD_LOGIN_AGE=4
+LIBSYSTEMD_LOGIN_CURRENT=6
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=6
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=8
+LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=19
+LIBSYSTEMD_ID128_REVISION=21
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=2
-LIBSYSTEMD_JOURNAL_AGE=8
+LIBSYSTEMD_JOURNAL_CURRENT=10
+LIBSYSTEMD_JOURNAL_REVISION=0
+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 = \
@@ -167,6 +173,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libudev \
        -I $(top_srcdir)/src/udev \
+       -I $(top_srcdir)/src/libsystemd-bus \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -221,7 +228,7 @@ define add-wants
          $(MKDIR_P) -m 0755 $$dir && \
          cd $$dir && \
          rm -f $$what && \
-         for i in $$what; do ln -s ../$$i . || exit $$? ; done )
+         for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
 endef
 
 install-directories-hook:
@@ -239,7 +246,7 @@ define install-aliases
        $(MKDIR_P) /$(DESTDIR)$$dir && \
        while [ -n "$$1" ]; do \
                rm -f $(DESTDIR)$$dir/$$2 && \
-               ln -s $$1 $(DESTDIR)$$dir/$$2 && \
+               $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
                shift 2 || exit $$?; \
        done
 endef
@@ -324,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 = \
@@ -409,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 \
@@ -433,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 \
@@ -453,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 \
@@ -479,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 += \
@@ -557,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))
 
@@ -677,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 += \
@@ -1058,7 +1072,7 @@ CLEANFILES += \
        src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
-noinst_PROGRAMS += \
+manual_tests += \
        test-engine \
        test-ns \
        test-loopback \
@@ -1069,7 +1083,7 @@ noinst_PROGRAMS += \
        test-watchdog \
        test-log
 
-noinst_tests += \
+tests += \
        test-job-type \
        test-env-replace \
        test-strbuf \
@@ -1086,7 +1100,10 @@ noinst_tests += \
        test-calendarspec \
        test-strip-tab-ansi \
        test-cgroup-util \
-       test-prioq
+       test-prioq \
+       test-fileio \
+       test-time \
+       test-hashmap
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1138,7 +1155,7 @@ test_hostname_LDADD = \
        libsystemd-core.la
 
 if ENABLE_EFI
-noinst_PROGRAMS += \
+manual_tests += \
        test-efivars
 
 test_efivars_SOURCES = \
@@ -1177,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
 
@@ -1186,6 +1212,24 @@ test_prioq_CFLAGS = \
 test_prioq_LDADD = \
        libsystemd-core.la
 
+test_fileio_SOURCES = \
+       src/test/test-fileio.c
+
+test_fileio_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_fileio_LDADD = \
+       libsystemd-core.la
+
+test_time_SOURCES = \
+       src/test/test-time.c
+
+test_time_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_time_LDADD = \
+       libsystemd-core.la
+
 test_log_SOURCES = \
        src/test/test-log.c
 
@@ -1611,7 +1655,9 @@ systemd_stdio_bridge_SOURCES = \
        src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-daemon.la
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
@@ -1666,34 +1712,46 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 libsystemd_bus_la_SOURCES = \
+       src/systemd/sd-bus.h \
+       src/systemd/sd-bus-protocol.h \
        src/libsystemd-bus/sd-bus.c \
-       src/libsystemd-bus/sd-bus.h \
-       src/libsystemd-bus/sd-bus-protocol.h \
        src/libsystemd-bus/bus-control.c \
+       src/libsystemd-bus/bus-control.h \
        src/libsystemd-bus/bus-error.c \
        src/libsystemd-bus/bus-error.h \
        src/libsystemd-bus/bus-internal.c \
        src/libsystemd-bus/bus-internal.h \
        src/libsystemd-bus/bus-socket.c \
        src/libsystemd-bus/bus-socket.h \
+       src/libsystemd-bus/bus-kernel.c \
+       src/libsystemd-bus/bus-kernel.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
        src/libsystemd-bus/bus-signature.c \
        src/libsystemd-bus/bus-signature.h \
        src/libsystemd-bus/bus-type.c \
-       src/libsystemd-bus/bus-type.h
+       src/libsystemd-bus/bus-type.h \
+       src/libsystemd-bus/bus-match.c \
+       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 \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-daemon.la
 
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
-noinst_tests += \
+tests += \
        test-bus-marshal \
        test-bus-signature \
-       test-bus-chat
+       test-bus-chat \
+       test-bus-server \
+       test-bus-match \
+       test-bus-kernel
 
 noinst_PROGRAMS += \
        busctl
@@ -1731,6 +1789,40 @@ test_bus_chat_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
+test_bus_server_SOURCES = \
+       src/libsystemd-bus/test-bus-server.c
+
+test_bus_server_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
+test_bus_server_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_match_SOURCES = \
+       src/libsystemd-bus/test-bus-match.c
+
+test_bus_match_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_match_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_kernel_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel.c
+
+test_bus_kernel_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
@@ -1998,7 +2090,7 @@ TESTS += \
        test/udev-test.pl \
        test/rules-test.sh
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-libudev \
        test-udev
 
@@ -2346,6 +2438,7 @@ dist_udevkeymap_DATA = \
        keymaps/hewlett-packard-tablet \
        keymaps/hewlett-packard-tx2 \
        keymaps/hewlett-packard_elitebook-8440p \
+       keymaps/hewlett-packard_elitebook-8460p \
        keymaps/hewlett-packard-hdx9494nr \
        keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        keymaps/inventec-symphony_6.0_7.0 \
@@ -2437,7 +2530,8 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-daemon-internal.la
 
 libsystemd_id128_internal_la_SOURCES = \
        $(libsystemd_id128_la_SOURCES)
@@ -2449,7 +2543,7 @@ test_id128_LDADD = \
        libsystemd-shared.la \
        libsystemd-id128-internal.la
 
-noinst_tests += \
+tests += \
        test-id128
 
 pkginclude_HEADERS += \
@@ -2757,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 \
@@ -2839,6 +2933,7 @@ systemd_journal_gatewayd_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon.la \
+       libsystemd-bus.la \
        $(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
@@ -3002,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
@@ -3381,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
@@ -3456,7 +3552,7 @@ test_inhibit_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-login \
        test-inhibit
 
@@ -3498,7 +3594,6 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-       libsystemd-daemon.la \
        libsystemd-audit.la \
        libsystemd-dbus.la \
        libsystemd-shared.la \
@@ -3936,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
@@ -4051,6 +4147,10 @@ hwdb-update:
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
+kdbus-update:
+       ( cd $(top_srcdir)/src/libsystemd-bus/ && \
+       wget -N https://d-bus.googlecode.com/git/kdbus.h )
+
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
Unnamed repository; edit this file 'description' to name the repository.