X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f41296b13eeb95f8f95c31e050e7ff9d7b64bd87;hp=eb95cc899f963bf308274915e9fbdfede9b69dad;hb=1f4ffab4a84a9fb4c7b10c01a2435f79c39ef05e;hpb=f000ad56fe2346cc8391eeb684681e707711b3ce

diff --git a/Makefile.am b/Makefile.am
index eb95cc899..f41296b13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=17
-LIBELOGIND_REVISION=2
-LIBELOGIND_AGE=17
+LIBELOGIND_CURRENT=18
+LIBELOGIND_REVISION=3
+LIBELOGIND_AGE=18
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -50,6 +50,8 @@ pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
+polkitrulesdir=$(datadir)/polkit-1/rules.d
+polkitpkladir=$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
 
@@ -85,6 +87,8 @@ noinst_DATA =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
 polkitpolicy_files =
+polkitrules_files =
+polkitpkla_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
@@ -97,9 +101,14 @@ dist_rootlibexec_DATA =
 rootlib_LTLIBRARIES =
 tests=
 manual_tests =
+TEST_DATA_FILES =
 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 =
@@ -131,6 +140,7 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_CGROUP_CONTROLLER_LEGACY=\"name=$(CGROUP_CONTROLLER)\" \
 	-DSYSTEMD_CGROUP_CONTROLLER_HYBRID=\"name=$(CGROUP_CONTROLLER)\" \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/elogind\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
 	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
@@ -156,6 +166,8 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libelogind/sd-id128 \
 	-I $(top_srcdir)/src/update-utmp \
 	-I $(top_srcdir)/src/sleep \
+	-DABS_SRC_DIR=\"$(abs_top_srcdir)\" \
+	-DABS_BUILD_DIR=\"$(abs_top_builddir)\" \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -192,6 +204,10 @@ AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =
+rootlibexec_PROGRAMS = \
+	elogind \
+	elogind-cgroups-agent
+
 pkglibexec_PROGRAMS =
 
 dist_doc_DATA = \
@@ -359,10 +375,14 @@ libbasic_la_SOURCES = \
 	src/basic/prioq.h \
 	src/basic/strv.c \
 	src/basic/strv.h \
+	src/basic/env-util.c \
+	src/basic/env-util.h \
 	src/basic/log.c \
 	src/basic/log.h \
 	src/basic/bus-label.c \
 	src/basic/bus-label.h \
+	src/basic/exec-util.c \
+	src/basic/exec-util.h \
 	src/basic/virt.c \
 	src/basic/virt.h \
 	src/basic/smack-util.c \
@@ -407,7 +427,10 @@ libbasic_la_SOURCES = \
 	src/basic/copy.c \
 	src/basic/copy.h \
 	src/basic/alloc-util.h \
-	src/basic/alloc-util.c
+	src/basic/alloc-util.c \
+	src/basic/format-util.h \
+	src/basic/khash.h \
+	src/basic/khash.c
 
 nodist_libbasic_la_SOURCES = \
 	src/basic/errno-from-name.h \
@@ -433,6 +456,8 @@ noinst_LTLIBRARIES += \
 	libshared.la
 
 libshared_la_SOURCES = \
+	src/shared/udev-util.h \
+	src/shared/udev-util.c \
 	src/shared/bus-util.c \
 	src/shared/bus-util.h \
 	src/shared/clean-ipc.c \
@@ -446,7 +471,11 @@ libshared_la_SOURCES = \
 	src/shared/sleep-config.c \
 	src/shared/sleep-config.h \
 	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h
+	src/shared/spawn-polkit-agent.h \
+	src/shared/tests.h \
+	src/shared/tests.c \
+	src/shared/nsflags.h \
+	src/shared/nsflags.c
 
 if HAVE_ACL
 libshared_la_SOURCES += \
@@ -535,6 +564,334 @@ src/basic/errno-to-name.h: src/basic/errno-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
+# ------------------------------------------------------------------------------
+
+manual_tests += \
+	test-cgroup
+
+unsafe_tests = \
+	test-ipcrm
+
+tests += \
+	test-log \
+	test-path-util \
+	test-siphash24 \
+	test-utf8 \
+	test-ellipsize \
+	test-util \
+	test-exec-util \
+	test-hexdecoct \
+	test-escape \
+	test-alloc-util \
+	test-proc-cmdline \
+	test-io-util \
+	test-fs-util \
+	test-stat-util \
+	test-fd-util \
+	test-string-util \
+	test-extract-word \
+	test-parse-util \
+	test-user-util \
+	test-process-util \
+	test-strip-tab-ansi \
+	test-prioq \
+	test-hashmap \
+	test-set \
+	test-list \
+	test-unaligned \
+	test-conf-files \
+	test-conf-parser \
+	test-locale-util \
+	test-copy \
+	test-verbs \
+	test-signal-util \
+	test-selinux \
+	test-sizeof
+
+TEST_DATA_FILES += \
+	test/bus-policy/hello.conf \
+	test/bus-policy/methods.conf \
+	test/bus-policy/ownerships.conf \
+	test/bus-policy/signals.conf \
+	test/bus-policy/check-own-rules.conf \
+	test/bus-policy/many-rules.conf \
+	test/bus-policy/test.conf
+
+
+EXTRA_DIST += \
+	src/test/test-helper.h
+
+test_utf8_SOURCES = \
+	src/test/test-utf8.c
+
+test_utf8_LDADD = \
+	libelogind-shared.la
+
+test_locale_util_SOURCES = \
+	src/test/test-locale-util.c
+
+test_locale_util_LDADD = \
+	libelogind-shared.la
+
+test_copy_SOURCES = \
+	src/test/test-copy.c
+
+# Link statically to ensure file is large
+test_copy_LDADD = \
+	libshared.la
+
+test_util_SOURCES = \
+	src/test/test-util.c
+
+test_util_LDADD = \
+	libelogind-shared.la
+
+test_exec_util_SOURCES = \
+	src/test/test-exec-util.c
+
+test_exec_util_LDADD = \
+	libelogind-shared.la
+
+test_hexdecoct_SOURCES = \
+	src/test/test-hexdecoct.c
+
+test_hexdecoct_LDADD = \
+	libelogind-shared.la
+
+test_alloc_util_SOURCES = \
+	src/test/test-alloc-util.c
+
+test_alloc_util_LDADD = \
+	libelogind-shared.la
+
+test_io_util_SOURCES = \
+	src/test/test-io-util.c
+
+test_io_util_LDADD = \
+	libelogind-shared.la
+
+test_fs_util_SOURCES = \
+	src/test/test-fs-util.c
+
+test_fs_util_LDADD = \
+	libelogind-shared.la
+
+test_proc_cmdline_SOURCES = \
+	src/test/test-proc-cmdline.c
+
+test_proc_cmdline_LDADD = \
+	libelogind-shared.la
+
+test_fd_util_SOURCES = \
+	src/test/test-fd-util.c
+
+test_fd_util_LDADD = \
+	libelogind-shared.la
+
+test_stat_util_SOURCES = \
+	src/test/test-stat-util.c
+
+test_stat_util_LDADD = \
+	libelogind-shared.la
+
+test_escape_SOURCES = \
+	src/test/test-escape.c
+
+test_escape_LDADD = \
+	libelogind-shared.la
+
+test_string_util_SOURCES = \
+	src/test/test-string-util.c
+
+test_string_util_LDADD = \
+	libelogind-shared.la
+
+test_extract_word_SOURCES = \
+	src/test/test-extract-word.c
+
+test_extract_word_LDADD = \
+	libelogind-shared.la
+
+test_parse_util_SOURCES = \
+	src/test/test-parse-util.c
+
+test_parse_util_LDADD = \
+	libelogind-shared.la
+
+test_user_util_SOURCES = \
+	src/test/test-user-util.c
+
+test_user_util_LDADD = \
+	libelogind-shared.la
+
+test_process_util_SOURCES = \
+	src/test/test-process-util.c
+
+test_process_util_LDADD = \
+	libelogind-shared.la
+
+test_verbs_SOURCES = \
+	src/test/test-verbs.c
+
+test_verbs_LDADD = \
+	libelogind-shared.la
+
+test_signal_util_SOURCES = \
+	src/test/test-signal-util.c
+
+test_signal_util_LDADD = \
+	libelogind-shared.la
+
+test_selinux_SOURCES = \
+	src/test/test-selinux.c
+
+test_selinux_LDADD = \
+	libelogind-shared.la
+
+test_sizeof_SOURCES = \
+	src/test/test-sizeof.c
+
+test_sizeof_LDADD = \
+	libelogind-shared.la
+
+BUILT_SOURCES += \
+	src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+	                   { if (!match($$0, "^#include"))          \
+	                         gsub(/hashmap/, "ordered_hashmap"); \
+	                     gsub(/HASHMAP/, "ORDERED_HASHMAP");     \
+	                     gsub(/Hashmap/, "OrderedHashmap");      \
+	                     print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+	src/test/test-hashmap-ordered.c
+
+test_hashmap_SOURCES = \
+	src/test/test-hashmap.c \
+	src/test/test-hashmap-plain.c
+
+test_hashmap_LDADD = \
+	libelogind-shared.la
+
+test_set_SOURCES = \
+	src/test/test-set.c
+
+test_set_LDADD = \
+	libelogind-shared.la
+
+test_list_SOURCES = \
+	src/test/test-list.c
+
+test_list_LDADD = \
+	libelogind-shared.la
+
+test_unaligned_LDADD = \
+	libelogind-shared.la
+
+test_unaligned_SOURCES = \
+	src/test/test-unaligned.c
+
+test_prioq_SOURCES = \
+	src/test/test-prioq.c
+
+test_prioq_LDADD = \
+	libelogind-shared.la
+
+test_log_SOURCES = \
+	src/test/test-log.c
+
+test_log_LDADD = \
+	libelogind-shared.la
+
+test_ipcrm_SOURCES = \
+	src/test/test-ipcrm.c
+
+test_ipcrm_LDADD = \
+	libelogind-shared.la
+
+test_ellipsize_SOURCES = \
+	src/test/test-ellipsize.c
+
+test_ellipsize_LDADD = \
+	libelogind-shared.la
+
+test_strip_tab_ansi_SOURCES = \
+	src/test/test-strip-tab-ansi.c
+
+test_strip_tab_ansi_LDADD = \
+	libelogind-shared.la
+
+test_cgroup_SOURCES = \
+	src/test/test-cgroup.c
+
+test_cgroup_LDADD = \
+	libelogind-shared.la
+
+test_path_util_SOURCES = \
+	src/test/test-path-util.c
+
+test_path_util_LDADD = \
+	libelogind-shared.la
+
+test_siphash24_SOURCES = \
+	src/test/test-siphash24.c
+
+test_siphash24_LDADD = \
+	libelogind-shared.la
+
+test_conf_files_SOURCES = \
+	src/test/test-conf-files.c
+
+test_conf_files_LDADD = \
+	libelogind-shared.la
+
+test_conf_parser_SOURCES = \
+	src/test/test-conf-parser.c
+
+test_conf_parser_LDADD = \
+	libelogind-shared.la
+
+# ------------------------------------------------------------------------------
+## .PHONY so it always rebuilds it
+.PHONY: coverage lcov-run lcov-report coverage-sync
+
+# run lcov from scratch, always
+coverage: all
+	$(MAKE) lcov-run
+	$(MAKE) lcov-report
+
+coverage_dir = coverage
+coverage_opts = --base-directory $(srcdir) --directory $(builddir) --rc 'geninfo_adjust_src_path=$(abspath $(srcdir))=>$(abspath $(builddir))'
+
+if ENABLE_COVERAGE
+# reset run coverage tests
+lcov-run:
+	@rm -rf $(coverage_dir)
+	lcov $(coverage_opts) --zerocounters
+	-$(MAKE) check
+
+# generate report based on current coverage data
+lcov-report:
+	$(MKDIR_P) $(coverage_dir)
+	lcov $(coverage_opts) --compat-libtool --capture --no-external \
+		| sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
+	lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*'
+	genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info
+	@echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
+
+# lcov doesn't work properly with vpath builds, make sure that bad
+# output is not uploaded by mistake.
+coverage-sync: coverage
+	test "$(builddir)" = "$(srcdir)"
+	rsync -rlv --delete --omit-dir-times coverage/ $(www_target)/coverage
+
+else
+lcov-run lcov-report:
+	echo "Need to reconfigure with --enable-coverage"
+endif
 
 # ------------------------------------------------------------------------------
 
@@ -655,6 +1012,71 @@ UNINSTALL_EXEC_HOOKS += header-uninstall-hook
 rootlib_LTLIBRARIES += \
 	libelogind.la
 
+tests += \
+	test-bus-signature \
+	test-bus-server \
+	test-bus-match \
+	test-bus-introspect \
+	test-bus-error \
+	test-event
+
+test_bus_signature_SOURCES = \
+	src/libelogind/sd-bus/test-bus-signature.c
+
+test_bus_signature_LDADD = \
+	libelogind-shared.la
+
+test_bus_server_SOURCES = \
+	src/libelogind/sd-bus/test-bus-server.c
+
+test_bus_server_LDADD = \
+	libelogind-shared.la
+
+test_bus_error_SOURCES = \
+	src/libelogind/sd-bus/test-bus-error.c
+
+# Link statically because this test uses BUS_ERROR_MAP_ELF_REGISTER
+test_bus_error_LDADD = \
+	libshared.la
+
+test_bus_match_SOURCES = \
+	src/libelogind/sd-bus/test-bus-match.c
+
+test_bus_match_LDADD = \
+	libelogind-shared.la
+
+test_bus_introspect_SOURCES = \
+	src/libelogind/sd-bus/test-bus-introspect.c
+
+test_bus_introspect_LDADD = \
+	libelogind-shared.la
+
+test_event_SOURCES = \
+	src/libelogind/sd-event/test-event.c
+
+test_event_LDADD = \
+	libelogind-shared.la
+
+# ------------------------------------------------------------------------------
+test_id128_SOURCES = \
+	src/test/test-id128.c
+
+test_id128_LDADD = \
+	libelogind-shared.la
+
+tests += \
+	test-id128
+
+# ------------------------------------------------------------------------------
+test_hash_SOURCES = \
+	src/test/test-hash.c
+
+test_hash_LDADD = \
+	libelogind-shared.la
+
+tests += \
+	test-hash
+
 # ------------------------------------------------------------------------------
 elogind_SOURCES = \
 	src/login/logind.c \
@@ -673,8 +1095,6 @@ libelogind_core_la_SOURCES = \
 	src/core/mount-setup.c \
         src/login/elogind.c \
         src/login/elogind.h \
-        src/login/elogind-action.c \
-        src/login/elogind-action.h \
 	src/login/elogind-dbus.c \
 	src/login/elogind-dbus.h \
 	src/login/logind-core.c \
@@ -850,6 +1270,7 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 substitutions = \
+       '|rootlibdir=$(rootlibdir)|' \
        '|rootlibexecdir=$(rootlibexecdir)|' \
        '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
@@ -876,7 +1297,8 @@ substitutions = \
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
-		< $< > $@
+                -e '/^\#\# /d' \
+                < $< > $@
 
 man/%: man/%.in
 	$(SED_PROCESS)
@@ -928,6 +1350,8 @@ units/user/%: units/user/%.m4
 if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files)
+polkitrules_DATA = $(polkitrules_files)
+polkitpkla_DATA = $(polkitpkla_files)
 endif
 
 EXTRA_DIST += \
@@ -1081,21 +1505,21 @@ install-tree: all
 	tree $(abs_srcdir)/install-tree
 
 # Let's run all tests of the test suite, but under valgrind. Let's
-# exclude the one perl script we have in there
+# exclude perl/python/shell scripts we have in there
 .PHONY: valgrind-tests
 valgrind-tests: $(TESTS)
-	$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
+	$(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
 		if $(LIBTOOL) --mode=execute file $$f | grep -q shell; then \
 		echo -e "$${x}Skipping non-binary $$f"; else \
 		echo -e "$${x}Running $$f"; \
-		libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+		$(AM_TESTS_ENVIRONMENT) $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
 		x="\n\n"; \
 	done
 
 exported-%: %
 	$(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
 
-exported: $(addprefix exported-, $(lib_LTLIBRARIES))
+exported: $(addprefix exported-, $(rootlib_LTLIBRARIES))
 	$(AM_V_GEN)cat $^ > $@
 
 .PHONY: check-api-docs
@@ -1163,9 +1587,42 @@ BUILT_SOURCES += \
 tests += \
 	test-libelogind-sym
 
-.PHONY: cppcheck
+.PHONY: install-tests
+install-tests: $(tests) $(TEST_DATA_FILES)
+	for f in $(tests); do \
+	    if [ -x $(top_builddir)/.libs/$$f ]; then \
+		install -D -m 755 $(top_builddir)/.libs/$$f $(DESTDIR)/$(testsdir)/$$f; \
+	    else \
+		install -D -m 755 $(top_builddir)/$$f $(DESTDIR)/$(testsdir)/$$f; \
+	    fi; \
+	done
+	for f in $(TEST_DATA_FILES); do \
+	    install -D -m 644 $(top_srcdir)/$$f $(DESTDIR)/$(testsdir)/testdata/$${f#test/}; \
+	done
+
+.PHONY: cccc cppcheck
+cccc: all
+	cccc --outdir=$(top_builddir)/cccc \
+	`find $(top_srcdir)/src/ -name '*.h' -or -name '*.c'`
+
 cppcheck:
-	cppcheck --enable=all -q $(top_srcdir)
+	cppcheck --enable=all -q \
+	-I $(top_srcdir)/src \
+	-I $(top_builddir)/src/basic \
+	-I $(top_srcdir)/src/basic \
+	-I $(top_srcdir)/src/core \
+	-I $(top_srcdir)/src/shared \
+	-I $(top_builddir)/src/shared \
+	-I $(top_srcdir)/src/login \
+	-I $(top_srcdir)/src/systemd \
+	-I $(top_srcdir)/src/libelogind/sd-bus \
+	-I $(top_srcdir)/src/libelogind/sd-event \
+	-I $(top_srcdir)/src/libelogind/sd-login \
+	-I $(top_srcdir)/src/libelogind/sd-id128 \
+	-I $(top_srcdir)/src/update-utmp \
+	-I $(top_srcdir)/src/sleep \
+	--force \
+	$(top_srcdir)
 
 # Used to extract compile flags for YCM.
 print-%: