meson: increase timeout for parse_hwdb.py test to 90 s

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b62166cd16c6b1407fa84a06dfd65dae279e47cc..4838df69f9b9183b6a0cae5b9f61707cf21058a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -269,8 +269,10 @@ INSTALL_DIRS =
 
 SHUTDOWN_TARGET_WANTS =
 LOCAL_FS_TARGET_WANTS =
+REMOTE_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
 GRAPHICAL_TARGET_WANTS =
+MACHINES_TARGET_WANTS =
 RESCUE_TARGET_WANTS =
 SYSINIT_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
@@ -287,6 +289,8 @@ GENERAL_ALIASES =
 install-target-wants-hook:
        what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
        what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
+       what="$(REMOTE_FS_TARGET_WANTS)" && wants=remote-fs.target && dir=$(systemunitdir) && $(add-wants)
+       what="$(MACHINES_TARGET_WANTS)" && wants=machines.target && dir=$(systemunitdir) && $(add-wants)
        what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
        what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
        what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
@@ -539,7 +543,6 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-fs-fuse-connections.mount \
        units/tmp.mount \
-       units/var-lib-machines.mount \
        units/printer.target \
        units/sound.target \
        units/bluetooth.target \
@@ -1737,6 +1740,7 @@ TEST_DATA_FILES += \
        test/test-execute/exec-readonlypaths-mount-propagation.service \
        test/test-execute/exec-readwritepaths-mount-propagation.service \
        test/test-execute/exec-inaccessiblepaths-mount-propagation.service \
+       test/test-execute/exec-inaccessiblepaths-proc.service \
        test/test-execute/exec-spec-interpolation.service \
        test/test-execute/exec-systemcallerrornumber.service \
        test/test-execute/exec-systemcallfilter-failing2.service \
@@ -2675,13 +2679,13 @@ nodist_systemunit_DATA += \
 
 nodist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
+       tmpfiles.d/var.conf \
        tmpfiles.d/etc.conf
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
-       tmpfiles.d/var.conf \
        tmpfiles.d/home.conf \
        tmpfiles.d/systemd-nspawn.conf \
        tmpfiles.d/journal-nocow.conf
@@ -2691,6 +2695,11 @@ dist_tmpfiles_DATA += \
        tmpfiles.d/legacy.conf
 endif
 
+if HAVE_REMOTE
+nodist_tmpfiles_DATA += \
+       tmpfiles.d/systemd-remote.conf
+endif
+
 SYSINIT_TARGET_WANTS += \
        systemd-tmpfiles-setup-dev.service \
        systemd-tmpfiles-setup.service
@@ -2708,7 +2717,9 @@ endif
 
 EXTRA_DIST += \
        tmpfiles.d/systemd.conf.m4 \
+       tmpfiles.d/systemd-remote.conf.m4 \
        tmpfiles.d/etc.conf.m4 \
+       tmpfiles.d/var.conf.m4 \
        units/systemd-tmpfiles-setup-dev.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in
@@ -3461,6 +3472,7 @@ tests += \
        test-bus-zero-copy \
        test-bus-introspect \
        test-bus-objects \
+       test-bus-vtable \
        test-bus-error \
        test-bus-creds \
        test-bus-gvariant \
@@ -3530,6 +3542,12 @@ test_bus_objects_SOURCES = \
 test_bus_objects_LDADD = \
        libsystemd-shared.la
 
+test_bus_vtable_SOURCES = \
+       src/libsystemd/sd-bus/test-bus-vtable.c
+
+test_bus_vtable_LDADD = \
+       libsystemd-shared.la
+
 test_bus_error_SOURCES = \
        src/libsystemd/sd-bus/test-bus-error.c
 
@@ -3637,6 +3655,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-ipv4ll.h \
        src/systemd/sd-ipv4acd.h \
        src/systemd/sd-ndisc.h \
+       src/systemd/sd-radv.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
        src/systemd/sd-lldp.h \
@@ -3660,6 +3679,8 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/ndisc-internal.h \
        src/libsystemd-network/ndisc-router.h \
        src/libsystemd-network/ndisc-router.c \
+       src/libsystemd-network/sd-radv.c \
+       src/libsystemd-network/radv-internal.h \
        src/libsystemd-network/icmp6-util.h \
        src/libsystemd-network/icmp6-util.c \
        src/libsystemd-network/sd-dhcp6-client.c \
@@ -3753,6 +3774,16 @@ test_ndisc_rs_LDADD = \
        libudev.la \
        libsystemd-shared.la
 
+test_ndisc_ra_SOURCES = \
+       src/systemd/sd-ndisc.h \
+       src/libsystemd-network/icmp6-util.h \
+       src/libsystemd-network/test-ndisc-ra.c
+
+test_ndisc_ra_LDADD = \
+       libsystemd-network.la \
+       libudev.la \
+       libsystemd-shared.la
+
 test_dhcp6_client_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
        src/libsystemd-network/dhcp6-internal.h \
@@ -3779,6 +3810,7 @@ tests += \
        test-sd-dhcp-lease \
        test-ipv4ll \
        test-ndisc-rs \
+       test-ndisc-ra \
        test-dhcp6-client \
        test-lldp
 
@@ -4308,11 +4340,6 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
        $(MICROHTTPD_LIBS)
 
-if ENABLE_TMPFILES
-dist_tmpfiles_DATA += \
-       tmpfiles.d/systemd-remote.conf
-endif
-
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
        $(GNUTLS_LIBS)
@@ -5200,6 +5227,25 @@ systemd_timesyncd_LDADD = \
        libsystemd-shared.la \
        -lm
 
+test_timesync_SOURCES = \
+       src/timesync/test-timesync.c \
+       src/timesync/timesyncd-manager.c \
+       src/timesync/timesyncd-manager.h \
+       src/timesync/timesyncd-conf.c \
+       src/timesync/timesyncd-conf.h \
+       src/timesync/timesyncd-server.c \
+       src/timesync/timesyncd-server.h
+
+nodist_test_timesync_SOURCES = \
+       src/timesync/timesyncd-gperf.c
+
+test_timesync_LDADD = \
+       libsystemd-shared.la \
+       -lm
+
+tests += \
+       test-timesync
+
 rootlibexec_PROGRAMS += \
        systemd-timesyncd
 
@@ -5234,6 +5280,7 @@ manual_tests += \
        test-nss
 
 # ------------------------------------------------------------------------------
+if ENABLE_NSS_SYSTEMD
 libnss_systemd_la_SOURCES = \
        src/nss-systemd/nss-systemd.sym \
        src/nss-systemd/nss-systemd.c
@@ -5253,6 +5300,7 @@ libnss_systemd_la_LIBADD = \
 
 rootlib_LTLIBRARIES += \
        libnss_systemd.la
+endif
 
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
@@ -5279,6 +5327,10 @@ endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_MACHINED
+
+dist_systemunit_DATA += \
+       units/var-lib-machines.mount
+
 systemd_machined_SOURCES = \
        src/machine/machined.c \
        src/machine/machined.h
@@ -5857,6 +5909,8 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
        src/network/networkd-ndisc.h \
+       src/network/networkd-radv.c \
+       src/network/networkd-radv.h \
        src/network/networkd-ndisc.c \
        src/network/networkd-network.h \
        src/network/networkd-network.c \
@@ -6105,10 +6159,10 @@ test_login_tables_LDADD = \
        liblogind-core.la
 
 manual_tests += \
-       test-login \
        test-inhibit
 
 tests += \
+       test-login \
        test-login-tables \
        test-login-shared
 
@@ -6523,7 +6577,9 @@ SYSINIT_TARGET_WANTS += \
 
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
-       tmp.mount \
+       tmp.mount
+
+REMOTE_FS_TARGET_WANTS += \
        var-lib-machines.mount
 
 MULTI_USER_TARGET_WANTS += \
@@ -6539,6 +6595,11 @@ SYSINIT_TARGET_WANTS += \
        systemd-sysctl.service \
        systemd-ask-password-console.path
 
+if ENABLE_MACHINED
+MACHINES_TARGET_WANTS += \
+       var-lib-machines.mount
+endif
+
 if HAVE_SYSV_COMPAT
 SYSTEM_UNIT_ALIASES += \
        poweroff.target runlevel0.target \