bus: add a more comprehensive test for the bloom filter logic

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fa626c5a2fd887e3d4fdf78795fb01270e84f7bc..2b2efcc747278a360c862ec9adcae82cf4b30517 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \

+       units/systemd-update-utmp.service \

        units/systemd-update-utmp-runlevel.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-tmpfiles-setup-dev.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \


@@ -463,8 +463,8 @@ EXTRA_DIST += \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-remount-fs.service.in \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-remount-fs.service.in \

+       units/systemd-update-utmp.service.in \

        units/systemd-update-utmp-runlevel.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-tmpfiles-setup-dev.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \


@@ -695,7 +695,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fileio.h \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \
        src/shared/fileio.h \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \

-       src/shared/MurmurHash3.h
+       src/shared/MurmurHash3.h \
+       src/shared/refcnt.h

 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \


@@ -1748,6 +1749,10 @@ libsystemd_bus_la_LIBADD =  \
        libsystemd-shared.la \
        libsystemd-daemon.la
 
        libsystemd-shared.la \
        libsystemd-daemon.la
 

+libsystemd_bus_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+

 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 


@@ -1758,6 +1763,7 @@ tests += \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \

+       test-bus-kernel-bloom \

        test-bus-memfd \
        test-bus-zero-copy
 
        test-bus-memfd \
        test-bus-zero-copy
 


@@ -1831,6 +1837,17 @@ test_bus_kernel_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 

+test_bus_kernel_bloom_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_bloom_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+

 test_bus_memfd_SOURCES = \
        src/libsystemd-bus/test-bus-memfd.c
 
 test_bus_memfd_SOURCES = \
        src/libsystemd-bus/test-bus-memfd.c
 


@@ -3162,8 +3179,7 @@ rootlibexec_PROGRAMS += \
        systemd-random-seed
 
 nodist_systemunit_DATA += \
        systemd-random-seed
 
 nodist_systemunit_DATA += \

-       units/systemd-random-seed-save.service \
-       units/systemd-random-seed-load.service
+       units/systemd-random-seed.service

 
 systemd_random_seed_SOURCES = \
        src/random-seed/random-seed.c
 
 systemd_random_seed_SOURCES = \
        src/random-seed/random-seed.c


@@ -3172,16 +3188,13 @@ systemd_random_seed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
        libsystemd-label.la \
        libsystemd-shared.la
 

-SHUTDOWN_TARGET_WANTS += \
-       systemd-random-seed-save.service

 SYSINIT_TARGET_WANTS += \
 SYSINIT_TARGET_WANTS += \

-       systemd-random-seed-load.service
+       systemd-random-seed.service

 
 endif
 
 EXTRA_DIST += \
 
 endif
 
 EXTRA_DIST += \

-       units/systemd-random-seed-save.service.in \
-       units/systemd-random-seed-load.service.in
+       units/systemd-random-seed.service.in

 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP


@@ -4074,8 +4087,8 @@ RUNLEVEL4_TARGET_WANTS += \
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 endif
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 endif

-SHUTDOWN_TARGET_WANTS += \
-       systemd-update-utmp-shutdown.service
+SYSINIT_TARGET_WANTS += \
+       systemd-update-utmp.service

 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
        systemd-fsck-root.service \
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
        systemd-fsck-root.service \