]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
tests: override XDG_RUNTIME_DIR where we use the user runtime dir
[thirdparty/systemd.git] / Makefile.am
index b2a40ec46b816bda39d5d5c0f494cdc1cc2aa6fb..34eaefd0bf40897b9399cf70b7006cf7b91256ed 100644 (file)
@@ -131,8 +131,12 @@ TEST_EXTENSIONS = .py
 PY_LOG_COMPILER = $(PYTHON)
 DISABLE_HARD_ERRORS = yes
 if ENABLE_TESTS
-noinst_PROGRAMS = $(manual_tests) $(tests)
+noinst_PROGRAMS = $(manual_tests) $(tests) $(unsafe_tests)
 TESTS = $(tests)
+if ENABLE_UNSAFE_TESTS
+TESTS += \
+       $(unsafe_tests)
+endif
 else
 noinst_PROGRAMS =
 TESTS =
@@ -740,10 +744,9 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
        src/basic/missing.h \
+       src/basic/missing_syscall.h \
        src/basic/capability-util.c \
        src/basic/capability-util.h \
-       src/basic/c-rbtree.c \
-       src/basic/c-rbtree.h \
        src/basic/conf-files.c \
        src/basic/conf-files.h \
        src/basic/stdio-util.h \
@@ -1033,7 +1036,9 @@ libshared_la_SOURCES = \
        src/shared/machine-pool.c \
        src/shared/machine-pool.h \
        src/shared/resolve-util.c \
-       src/shared/resolve-util.h
+       src/shared/resolve-util.h \
+       src/shared/tests.h \
+       src/shared/tests.c
 
 if HAVE_UTMP
 libshared_la_SOURCES += \
@@ -1378,6 +1383,9 @@ pkgconfigdata_DATA += \
 nodist_rpmmacros_DATA = \
        src/core/macros.systemd
 
+BUILT_SOURCES += \
+       src/core/triggers.systemd
+
 EXTRA_DIST += \
        src/core/systemd.pc.in \
        src/core/macros.systemd.in \
@@ -1387,19 +1395,17 @@ EXTRA_DIST += \
 
 manual_tests += \
        test-ns \
-       test-loopback \
-       test-hostname \
-       test-daemon \
        test-cgroup \
        test-install \
-       test-watchdog \
-       test-log \
-       test-ipcrm \
        test-btrfs \
        test-acd \
        test-ipv4ll-manual \
        test-ask-password-api
 
+unsafe_tests = \
+       test-hostname \
+       test-ipcrm
+
 if HAVE_LIBIPTC
 manual_tests += \
        test-firewall-util
@@ -1411,10 +1417,14 @@ manual_tests += \
 endif
 
 tests += \
+       test-daemon \
+       test-log \
+       test-loopback \
        test-engine \
+       test-watchdog \
        test-cgroup-mask \
        test-job-type \
-       test-env-replace \
+       test-env-util \
        test-strbuf \
        test-strv \
        test-path \
@@ -1431,6 +1441,9 @@ tests += \
        test-escape \
        test-alloc-util \
        test-proc-cmdline \
+       test-io-util \
+       test-glob-util \
+       test-xattr-util \
        test-fs-util \
        test-web-util \
        test-stat-util \
@@ -1481,7 +1494,6 @@ tests += \
        test-copy \
        test-cap-list \
        test-sigbus \
-       test-rbtree \
        test-verbs \
        test-af-list \
        test-arphrd-list \
@@ -1553,6 +1565,7 @@ EXTRA_DIST += \
        test/test-execute/exec-passenvironment-repeated.service \
        test/test-execute/exec-passenvironment.service \
        test/test-execute/exec-group.service \
+       test/test-execute/exec-group-nfsnobody.service \
        test/test-execute/exec-ignoresigpipe-no.service \
        test/test-execute/exec-ignoresigpipe-yes.service \
        test/test-execute/exec-personality-x86-64.service \
@@ -1568,7 +1581,10 @@ EXTRA_DIST += \
        test/test-execute/exec-systemcallfilter-failing.service \
        test/test-execute/exec-systemcallfilter-not-failing2.service \
        test/test-execute/exec-systemcallfilter-not-failing.service \
+       test/test-execute/exec-systemcallfilter-system-user.service \
+       test/test-execute/exec-systemcallfilter-system-user-nfsnobody.service \
        test/test-execute/exec-user.service \
+       test/test-execute/exec-user-nfsnobody.service \
        test/test-execute/exec-workingdirectory.service \
        test/test-execute/exec-umask-0177.service \
        test/test-execute/exec-umask-default.service \
@@ -1585,10 +1601,13 @@ EXTRA_DIST += \
        test/test-execute/exec-capabilityboundingset-reset.service \
        test/test-execute/exec-capabilityboundingset-simple.service \
        test/test-execute/exec-capabilityambientset.service \
+       test/test-execute/exec-capabilityambientset-nfsnobody.service \
        test/test-execute/exec-capabilityambientset-merge.service \
+       test/test-execute/exec-capabilityambientset-merge-nfsnobody.service \
        test/test-execute/exec-runtimedirectory.service \
        test/test-execute/exec-runtimedirectory-mode.service \
        test/test-execute/exec-runtimedirectory-owner.service \
+       test/test-execute/exec-runtimedirectory-owner-nfsnobody.service \
        test/bus-policy/hello.conf \
        test/bus-policy/methods.conf \
        test/bus-policy/ownerships.conf \
@@ -1660,13 +1679,13 @@ test_dns_domain_LDADD = \
 
 
 if ENABLE_EFI
-manual_tests += \
-       test-boot-timestamp
+tests += \
+       test-boot-timestamps
 
-test_boot_timestamp_SOURCES = \
+test_boot_timestamps_SOURCES = \
        src/test/test-boot-timestamps.c
 
-test_boot_timestamp_LDADD = \
+test_boot_timestamps_LDADD = \
        libshared.la
 endif
 
@@ -1728,12 +1747,6 @@ test_sigbus_SOURCES = \
 test_sigbus_LDADD = \
        libshared.la
 
-test_rbtree_SOURCES = \
-       src/test/test-rbtree.c
-
-test_rbtree_LDADD = \
-       libshared.la
-
 test_condition_SOURCES = \
        src/test/test-condition.c
 
@@ -1776,6 +1789,24 @@ test_alloc_util_SOURCES = \
 test_alloc_util_LDADD = \
        libbasic.la
 
+test_xattr_util_SOURCES = \
+       src/test/test-xattr-util.c
+
+test_xattr_util_LDADD = \
+       libbasic.la
+
+test_io_util_SOURCES = \
+       src/test/test-io-util.c
+
+test_io_util_LDADD = \
+       libbasic.la
+
+test_glob_util_SOURCES = \
+       src/test/test-glob-util.c
+
+test_glob_util_LDADD = \
+       libbasic.la
+
 test_fs_util_SOURCES = \
        src/test/test-fs-util.c
 
@@ -2162,10 +2193,10 @@ test_cgroup_util_SOURCES = \
 test_cgroup_util_LDADD = \
        libshared.la
 
-test_env_replace_SOURCES = \
-       src/test/test-env-replace.c
+test_env_util_SOURCES = \
+       src/test/test-env-util.c
 
-test_env_replace_LDADD = \
+test_env_util_LDADD = \
        libshared.la
 
 test_strbuf_SOURCES = \
@@ -2990,7 +3021,9 @@ systemd_nspawn_SOURCES = \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
        src/core/loopback-setup.c \
-       src/core/loopback-setup.h
+       src/core/loopback-setup.h \
+       src/core/machine-id-setup.c \
+       src/core/machine-id-setup.h
 
 nodist_systemd_nspawn_SOURCES = \
        src/nspawn/nspawn-gperf.c
@@ -3388,7 +3421,6 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/sd-dhcp6-lease.c \
        src/libsystemd-network/dhcp-identifier.h \
        src/libsystemd-network/dhcp-identifier.c \
-       src/libsystemd-network/lldp.h \
        src/libsystemd-network/lldp-internal.h \
        src/libsystemd-network/lldp-network.h \
        src/libsystemd-network/lldp-network.c \
@@ -3766,8 +3798,10 @@ endif
 endif
 endif
 
+tests += \
+       test-libudev
+
 manual_tests += \
-       test-libudev \
        test-udev
 
 test_libudev_SOURCES = \
@@ -3790,9 +3824,11 @@ check_DATA += \
 endif
 
 # packed sysfs test tree
-test/sys:
+test/sys: test/sys.tar.xz
+       -rm -rf test/sys
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
+       -touch test/sys
 
 test-sys-distclean:
        -rm -rf test/sys
@@ -3915,6 +3951,34 @@ systemd_cat_SOURCES = \
 systemd_cat_LDADD = \
        libjournal-core.la
 
+if HAVE_LIBCURL
+rootlibexec_PROGRAMS += \
+        systemd-journal-upload
+
+systemd_journal_upload_SOURCES = \
+        src/journal-remote/journal-upload.h \
+        src/journal-remote/journal-upload.c \
+        src/journal-remote/journal-upload-journal.c
+
+systemd_journal_upload_CFLAGS = \
+        $(AM_CFLAGS) \
+        $(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+        libshared.la \
+        $(LIBCURL_LIBS)
+
+nodist_systemunit_DATA += \
+        units/systemd-journal-upload.service
+
+nodist_pkgsysconf_DATA += \
+        src/journal-remote/journal-upload.conf
+endif
+
+EXTRA_DIST += \
+        units/systemd-journal-upload.service.in \
+        src/journal-remote/journal-upload.conf.in
+
 if HAVE_MICROHTTPD
 rootlibexec_PROGRAMS += \
        systemd-journal-remote
@@ -3974,34 +4038,6 @@ EXTRA_DIST += \
        src/journal-remote/log-generator.py
 endif
 
-if HAVE_LIBCURL
-rootlibexec_PROGRAMS += \
-       systemd-journal-upload
-
-systemd_journal_upload_SOURCES = \
-       src/journal-remote/journal-upload.h \
-       src/journal-remote/journal-upload.c \
-       src/journal-remote/journal-upload-journal.c
-
-systemd_journal_upload_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBCURL_CFLAGS)
-
-systemd_journal_upload_LDADD = \
-       libshared.la \
-       $(LIBCURL_LIBS)
-
-nodist_systemunit_DATA += \
-       units/systemd-journal-upload.service
-
-nodist_pkgsysconf_DATA += \
-       src/journal-remote/journal-upload.conf
-endif
-
-EXTRA_DIST += \
-       units/systemd-journal-upload.service.in \
-       src/journal-remote/journal-upload.conf.in
-
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
@@ -4178,11 +4214,9 @@ catalog-remove-hook:
 UNINSTALL_DATA_HOOKS += \
        catalog-remove-hook
 
-manual_tests += \
-       test-journal-enum
-
 tests += \
        test-journal \
+       test-journal-enum \
        test-journal-send \
        test-journal-syslog \
        test-journal-match \
@@ -4227,7 +4261,9 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/mmap-cache.h \
        src/journal/compress.c \
        src/journal/audit-type.h \
-       src/journal/audit-type.c
+       src/journal/audit-type.c \
+       src/shared/gcrypt-util.h \
+       src/shared/gcrypt-util.c
 
 nodist_libsystemd_journal_internal_la_SOURCES = \
        src/journal/audit_type-to-name.h
@@ -4259,9 +4295,7 @@ libsystemd_journal_internal_la_SOURCES += \
        src/journal/journal-authenticate.c \
        src/journal/journal-authenticate.h \
        src/journal/fsprg.c \
-       src/journal/fsprg.h \
-       src/shared/gcrypt-util.c \
-       src/shared/gcrypt-util.h
+       src/journal/fsprg.h
 
 libsystemd_journal_internal_la_LIBADD += \
        $(GCRYPT_LIBS)
@@ -4688,8 +4722,7 @@ systemd_localed_SOURCES = \
        src/locale/localed.c
 
 systemd_localed_LDADD = \
-       libshared.la \
-       $(XKBCOMMON_LIBS)
+       libshared.la
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -4840,6 +4873,17 @@ EXTRA_DIST += \
        units/systemd-timesyncd.service.in \
        src/timesync/timesyncd.conf.in
 
+# ------------------------------------------------------------------------------
+test_nss_SOURCES = \
+       src/test/test-nss.c
+
+test_nss_LDADD = \
+       libsystemd-internal.la \
+       -ldl
+
+manual_tests += \
+       test-nss
+
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
@@ -5363,6 +5407,8 @@ libnetworkd_core_la_CFLAGS = \
 libnetworkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
+       src/network/networkd-conf.h \
+       src/network/networkd-conf.c \
        src/network/networkd-link.h \
        src/network/networkd-link.c \
        src/network/networkd-netdev.h \
@@ -5411,6 +5457,7 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-lldp-tx.c
 
 nodist_libnetworkd_core_la_SOURCES = \
+       src/network/networkd-gperf.c \
        src/network/networkd-network-gperf.c \
        src/network/networkd-netdev-gperf.c
 
@@ -5507,6 +5554,7 @@ BUSNAMES_TARGET_WANTS += \
 endif
 
 gperf_gperf_sources += \
+       src/network/networkd-gperf.gperf \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf
 
@@ -6130,7 +6178,6 @@ DISTCHECK_CONFIGURE_FLAGS += \
 endif
 
 .PHONY: dist-check-help
-
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
             if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
@@ -6139,6 +6186,18 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
+include_compilers = "$(CC)" "$(CC) -ansi" "$(CC) -std=iso9899:1990"
+public_headers = $(filter-out src/systemd/_sd-common.h, $(pkginclude_HEADERS) $(include_HEADERS))
+.PHONY: dist-check-includes
+dist-check-includes: $(public_headers)
+       @res=0;                                                                 \
+       for i in $(abspath $^); do                                              \
+           for cc in $(include_compilers); do                                  \
+               echo "$$cc -o/dev/null -c -x c -include "$$i" - </dev/null";    \
+               $$cc -o/dev/null -c -x c -include "$$i" - </dev/null || res=1;  \
+           done;                                                               \
+       done; exit $$res
+
 .PHONY: hwdb-update
 hwdb-update:
        ( cd $(top_srcdir)/hwdb && \