test-execute: Add tests for new PassEnvironment= directive

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cd5ea6f32c19e3a387c66bbd96f50f11d71c3905..b13473d0d54f735f87db0bdf5f3811e6a41e9c75 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1138,8 +1138,6 @@ libcore_la_SOURCES = \
        src/core/bus-policy.h \
        src/core/target.c \
        src/core/target.h \
-       src/core/snapshot.c \
-       src/core/snapshot.h \
        src/core/device.c \
        src/core/device.h \
        src/core/mount.c \
@@ -1178,8 +1176,6 @@ libcore_la_SOURCES = \
        src/core/dbus-busname.h \
        src/core/dbus-target.c \
        src/core/dbus-target.h \
-       src/core/dbus-snapshot.c \
-       src/core/dbus-snapshot.h \
        src/core/dbus-device.c \
        src/core/dbus-device.h \
        src/core/dbus-mount.c \
@@ -1447,6 +1443,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-string-util \
        test-extract-word \
        test-parse-util \
        test-user-util \
@@ -1505,7 +1502,7 @@ EXTRA_DIST += \
        test/c.service \
        test/daughter.service \
        test/d.service \
-       test/end.service.in \
+       test/end.service \
        test/e.service \
        test/f.service \
        test/grandchild.service \
@@ -1515,7 +1512,6 @@ EXTRA_DIST += \
        test/h.service \
        test/parent-deep.slice \
        test/parent.slice \
-       test/paths.target \
        test/sched_idle_bad.service \
        test/sched_idle_ok.service \
        test/sched_rr_bad.service \
@@ -1529,44 +1525,62 @@ EXTRA_DIST += \
        test/testsuite.target \
        test/timers.target \
        test/unstoppable.service \
-       test/path-changed.service \
-       test/path-directorynotempty.service \
-       test/path-existsglob.service \
-       test/path-exists.service \
-       test/path-makedirectory.service \
-       test/path-modified.service \
-       test/path-mycustomunit.service \
-       test/path-service.service \
-       test/path-changed.path \
-       test/path-directorynotempty.path \
-       test/path-existsglob.path \
-       test/path-exists.path \
-       test/path-makedirectory.path \
-       test/path-modified.path \
-       test/path-unit.path \
-       test/exec-environment-empty.service \
-       test/exec-environment-multiple.service \
-       test/exec-environment.service \
-       test/exec-group.service \
-       test/exec-ignoresigpipe-no.service \
-       test/exec-ignoresigpipe-yes.service \
-       test/exec-personality-x86-64.service \
-       test/exec-personality-x86.service \
-       test/exec-personality-s390.service \
-       test/exec-privatedevices-no.service \
-       test/exec-privatedevices-yes.service \
-       test/exec-privatetmp-no.service \
-       test/exec-privatetmp-yes.service \
-       test/exec-systemcallerrornumber.service \
-       test/exec-systemcallfilter-failing2.service \
-       test/exec-systemcallfilter-failing.service \
-       test/exec-systemcallfilter-not-failing2.service \
-       test/exec-systemcallfilter-not-failing.service \
-       test/exec-user.service \
-       test/exec-workingdirectory.service \
-       test/exec-umask-0177.service \
-       test/exec-umask-default.service \
-       test/exec-privatenetwork-yes.service \
+       test/test-path/paths.target \
+       test/test-path/basic.target \
+       test/test-path/sysinit.target \
+       test/test-path/path-changed.service \
+       test/test-path/path-directorynotempty.service \
+       test/test-path/path-existsglob.service \
+       test/test-path/path-exists.service \
+       test/test-path/path-makedirectory.service \
+       test/test-path/path-modified.service \
+       test/test-path/path-mycustomunit.service \
+       test/test-path/path-service.service \
+       test/test-path/path-changed.path \
+       test/test-path/path-directorynotempty.path \
+       test/test-path/path-existsglob.path \
+       test/test-path/path-exists.path \
+       test/test-path/path-makedirectory.path \
+       test/test-path/path-modified.path \
+       test/test-path/path-unit.path \
+       test/test-execute/exec-environment-empty.service \
+       test/test-execute/exec-environment-multiple.service \
+       test/test-execute/exec-environment.service \
+       test/test-execute/exec-passenvironment-absent.service \
+       test/test-execute/exec-passenvironment-empty.service \
+       test/test-execute/exec-passenvironment-repeated.service \
+       test/test-execute/exec-passenvironment.service \
+       test/test-execute/exec-group.service \
+       test/test-execute/exec-ignoresigpipe-no.service \
+       test/test-execute/exec-ignoresigpipe-yes.service \
+       test/test-execute/exec-personality-x86-64.service \
+       test/test-execute/exec-personality-x86.service \
+       test/test-execute/exec-personality-s390.service \
+       test/test-execute/exec-privatedevices-no.service \
+       test/test-execute/exec-privatedevices-yes.service \
+       test/test-execute/exec-privatetmp-no.service \
+       test/test-execute/exec-privatetmp-yes.service \
+       test/test-execute/exec-systemcallerrornumber.service \
+       test/test-execute/exec-systemcallfilter-failing2.service \
+       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-user.service \
+       test/test-execute/exec-workingdirectory.service \
+       test/test-execute/exec-umask-0177.service \
+       test/test-execute/exec-umask-default.service \
+       test/test-execute/exec-privatenetwork-yes.service \
+       test/test-execute/exec-environmentfile.service \
+       test/test-execute/exec-oomscoreadjust-positive.service \
+       test/test-execute/exec-oomscoreadjust-negative.service \
+       test/test-execute/exec-ioschedulingclass-best-effort.service \
+       test/test-execute/exec-ioschedulingclass-idle.service \
+       test/test-execute/exec-ioschedulingclass-none.service \
+       test/test-execute/exec-ioschedulingclass-realtime.service \
+       test/test-execute/exec-capabilityboundingset-invert.service \
+       test/test-execute/exec-capabilityboundingset-merge.service \
+       test/test-execute/exec-capabilityboundingset-reset.service \
+       test/test-execute/exec-capabilityboundingset-simple.service \
        test/bus-policy/hello.conf \
        test/bus-policy/methods.conf \
        test/bus-policy/ownerships.conf \
@@ -1735,6 +1749,12 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libshared.la
 
+test_string_util_SOURCES = \
+       src/test/test-string-util.c
+
+test_string_util_LDADD = \
+       libshared.la
+
 test_extract_word_SOURCES = \
        src/test/test-extract-word.c
 
@@ -3285,7 +3305,6 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-ndisc.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
-       src/systemd/sd-pppoe.h \
        src/systemd/sd-lldp.h \
        src/libsystemd-network/sd-dhcp-client.c \
        src/libsystemd-network/sd-dhcp-server.c \
@@ -3301,7 +3320,6 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/sd-ipv4acd.c \
        src/libsystemd-network/arp-util.h \
        src/libsystemd-network/arp-util.c \
-       src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
        src/libsystemd-network/sd-ndisc.c \
@@ -3382,14 +3400,6 @@ test_acd_LDADD = \
        libsystemd-network.la \
        libshared.la
 
-test_pppoe_SOURCES = \
-       src/systemd/sd-pppoe.h \
-       src/libsystemd-network/test-pppoe.c
-
-test_pppoe_LDADD = \
-       libsystemd-network.la \
-       libshared.la
-
 test_ndisc_rs_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-ndisc.h \
@@ -3434,9 +3444,6 @@ tests += \
        test-dhcp6-client \
        test-lldp
 
-manual_tests += \
-       test-pppoe
-
 # ------------------------------------------------------------------------------
 include_HEADERS += \
        src/libudev/libudev.h