tests: override XDG_RUNTIME_DIR where we use the user runtime dir

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7668c541cb9b4d39391d5ffd93638c6340ef5f5e..34eaefd0bf40897b9399cf70b7006cf7b91256ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -747,8 +747,6 @@ libbasic_la_SOURCES = \
        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 \
@@ -1038,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 += \
@@ -1383,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 \
@@ -1491,7 +1494,6 @@ tests += \
        test-copy \
        test-cap-list \
        test-sigbus \
-       test-rbtree \
        test-verbs \
        test-af-list \
        test-arphrd-list \
@@ -1745,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
 
@@ -3025,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
@@ -3826,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
@@ -4722,8 +4722,7 @@ systemd_localed_SOURCES = \
        src/locale/localed.c
 
 systemd_localed_LDADD = \
-       libshared.la \
-       $(XKBCOMMON_LIBS)
+       libshared.la
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -4874,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 = \