chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core/cgroup-util: simplify functions and add tests
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5692077b34ca0d7d56bec39d75e507cf888999b6..25d99950ff72e6045fa57960a69828a747795a8b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-118,8
+118,9
@@
dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
-noinst_PROGRAMS =
-TESTS =
+noinst_tests=
+noinst_PROGRAMS = $(noinst_tests)
+TESTS = $(noinst_tests)
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
@@
-291,7
+292,6
@@
dist_systemunit_DATA = \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
- units/syslog.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target
@@
-1174,27
+1174,16
@@
CLEANFILES += \
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
test-engine \
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
test-engine \
- test-job-type \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
- test-env-replace \
- test-strv \
test-install \
test-watchdog \
test-install \
test-watchdog \
- test-unit-name \
- test-log \
- test-unit-file \
- test-date \
- test-sleep \
- test-replace-var \
- test-sched-prio \
- test-calendarspec \
- test-strip-tab-ansi
+ test-log
-
TESTS
+= \
+
noinst_tests
+= \
test-job-type \
test-env-replace \
test-strv \
test-job-type \
test-env-replace \
test-strv \
@@
-1205,7
+1194,8
@@
TESTS += \
test-replace-var \
test-sched-prio \
test-calendarspec \
test-replace-var \
test-sched-prio \
test-calendarspec \
- test-strip-tab-ansi
+ test-strip-tab-ansi \
+ test-cgroup-util
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1322,6
+1312,13
@@
test_cgroup_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-shared.la
+test_cgroup_util_SOURCES = \
+ src/test/test-cgroup-util.c
+
+test_cgroup_util_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la
+
test_env_replace_SOURCES = \
src/test/test-env-replace.c
test_env_replace_SOURCES = \
src/test/test-env-replace.c
@@
-2439,10
+2436,7
@@
test_id128_LDADD = \
libsystemd-shared.la \
libsystemd-id128-internal.la
libsystemd-shared.la \
libsystemd-id128-internal.la
-noinst_PROGRAMS += \
- test-id128
-
-TESTS += \
+noinst_tests += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
@@
-2732,17
+2726,10
@@
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
noinst_PROGRAMS += \
catalog-remove-hook
noinst_PROGRAMS += \
- test-journal \
- test-journal-send \
- test-journal-syslog \
- test-journal-match \
test-journal-enum \
test-journal-enum \
- test-journal-stream \
- test-journal-verify \
- test-mmap-cache \
test-catalog
test-catalog
-
TESTS
+= \
+
noinst_tests
+= \
test-journal \
test-journal-send \
test-journal-syslog \
test-journal \
test-journal-send \
test-journal-syslog \
@@
-2820,7
+2807,9
@@
rootlibexec_PROGRAMS += \
systemd-journal-gatewayd
systemd_journal_gatewayd_SOURCES = \
systemd-journal-gatewayd
systemd_journal_gatewayd_SOURCES = \
- src/journal/journal-gatewayd.c
+ src/journal/journal-gatewayd.c \
+ src/journal/microhttpd-util.h \
+ src/journal/microhttpd-util.c
systemd_journal_gatewayd_LDADD = \
libsystemd-shared.la \
systemd_journal_gatewayd_LDADD = \
libsystemd-shared.la \