Ubuntu
upstart package

Merge lp:~serge-hallyn/ubuntu/utopic/upstart/cgroup-race2 into lp:ubuntu/utopic/upstart

  1. Utopic (14.10)
  2. cgroup-race2
  3. Merge into utopic
Proposed by Serge Hallyn
Status: Needs review
Proposed branch: lp:~serge-hallyn/ubuntu/utopic/upstart/cgroup-race2
Merge into: lp:ubuntu/utopic/upstart
Diff against target: 3065 lines (+546/-2028)
25 files modified
Makefile.in (+2/-0)
aclocal.m4 (+2/-1)
conf/Makefile.in (+2/-0)
config.h.in (+3/-0)
configure (+117/-1)
contrib/Makefile.in (+2/-0)
dbus/Makefile.in (+2/-0)
debian/changelog (+6/-0)
doc/Makefile.in (+2/-0)
extra/Makefile.in (+2/-0)
init/Makefile.in (+102/-451)
init/cgroup.c (+4/-1)
init/cgroup.h (+1/-1)
init/job_process.c (+1/-1)
init/tests/libwrap_inotify.la (+0/-41)
lib/Makefile.in (+98/-324)
lib/upstart/com.ubuntu.Upstart.Instance.h (+0/-107)
lib/upstart/com.ubuntu.Upstart.Job.h (+0/-140)
lib/upstart/com.ubuntu.Upstart.h (+0/-180)
lib/upstart/upstart-dbus.h (+0/-84)
ltmain.sh (+2/-2)
scripts/Makefile.in (+2/-0)
scripts/data/Makefile.in (+2/-0)
test/Makefile.in (+96/-349)
util/Makefile.in (+98/-345)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/utopic/upstart/cgroup-race2
Reviewer Review Type Date Requested Status
James Hunt Pending
Review via email: mp+232489@code.launchpad.net

Description of the change

I realize this should be done through lp:upstart. This tree allowed me to easily test. So I expect this to be rejected, but am doing the mp as a way to toss the patch over.

If I have a upstart job which says 'cgroup freezer xxx', then the pre-start script is in /xxx_2, the script in /xxx_0, and the post-stop in /xxx_4, preventing the race.

To post a comment you must log in.

Unmerged revisions

1585. By Serge Hallyn

use different cgroup name for each upstart job type (LP: #1357252)

1584. By Serge Hallyn

use different cgroup name for each upstart job type.

1583. By Serge Hallyn

cgroup: use different cgroup name per job type

Append the job type to the cgroup name to avoid re-use and
corresponding races when the main job exits, post-stop starts,
post-stop creates cgroup, cgroup notify-on-release handler
removes cgroup, and post-stop then executes its script.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.in'
2--- Makefile.in 2014-07-17 13:14:00 +0000
3+++ Makefile.in 2014-08-27 23:03:20 +0000
4@@ -293,6 +293,8 @@
5 POSUB = @POSUB@
6 RANLIB = @RANLIB@
7 SED = @SED@
8+SELINUX_CFLAGS = @SELINUX_CFLAGS@
9+SELINUX_LIBS = @SELINUX_LIBS@
10 SET_MAKE = @SET_MAKE@
11 SHELL = @SHELL@
12 STRIP = @STRIP@
13
14=== modified file 'aclocal.m4'
15--- aclocal.m4 2014-03-11 15:23:07 +0000
16+++ aclocal.m4 2014-08-27 23:03:20 +0000
17@@ -573,7 +573,8 @@
18 END
19 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
20 fi
21-fi])
22+fi
23+])
24
25 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
26 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
27
28=== modified file 'conf/Makefile.in'
29--- conf/Makefile.in 2014-07-14 12:48:09 +0000
30+++ conf/Makefile.in 2014-08-27 23:03:20 +0000
31@@ -239,6 +239,8 @@
32 POSUB = @POSUB@
33 RANLIB = @RANLIB@
34 SED = @SED@
35+SELINUX_CFLAGS = @SELINUX_CFLAGS@
36+SELINUX_LIBS = @SELINUX_LIBS@
37 SET_MAKE = @SET_MAKE@
38 SHELL = @SHELL@
39 STRIP = @STRIP@
40
41=== modified file 'config.h.in'
42--- config.h.in 2014-07-14 12:48:09 +0000
43+++ config.h.in 2014-08-27 23:03:20 +0000
44@@ -37,6 +37,9 @@
45 /* Define to 1 if you have the <memory.h> header file. */
46 #undef HAVE_MEMORY_H
47
48+/* Define if we have SELinux */
49+#undef HAVE_SELINUX
50+
51 /* Define to 1 if you have the <stdint.h> header file. */
52 #undef HAVE_STDINT_H
53
54
55=== modified file 'configure'
56--- configure 2014-07-17 13:14:00 +0000
57+++ configure 2014-08-27 23:03:20 +0000
58@@ -639,6 +639,8 @@
59 am__EXEEXT_TRUE
60 LTLIBOBJS
61 LIBOBJS
62+SELINUX_LIBS
63+SELINUX_CFLAGS
64 HAVE_ABI_CHECKER_FALSE
65 HAVE_ABI_CHECKER_TRUE
66 ABI_COMPLIANCE_CHECKER
67@@ -831,6 +833,7 @@
68 enable_dconf_bridge
69 enable_cgroups
70 enable_abi_check
71+enable_selinux
72 enable_threading
73 enable_compiler_warnings
74 enable_compiler_optimisations
75@@ -864,7 +867,9 @@
76 CGMANAGER_CFLAGS
77 CGMANAGER_LIBS
78 JSON_CFLAGS
79-JSON_LIBS'
80+JSON_LIBS
81+SELINUX_CFLAGS
82+SELINUX_LIBS'
83
84
85 # Initialize some variables set by options.
86@@ -1510,6 +1515,7 @@
87 --disable-cgroups Disable support for Linux cgroups
88 --disable-abi-check Disable libupstart ABI check performed if
89 abi-compliance-checker available
90+ --enable-selinux enable SELinux support
91 --enable-threading Enable support for multi-threading
92 --enable-compiler-warnings
93 Enable additional compiler warnings
94@@ -1571,6 +1577,10 @@
95 linker flags for CGMANAGER, overriding pkg-config
96 JSON_CFLAGS C compiler flags for JSON, overriding pkg-config
97 JSON_LIBS linker flags for JSON, overriding pkg-config
98+ SELINUX_CFLAGS
99+ C compiler flags for SELINUX, overriding pkg-config
100+ SELINUX_LIBS
101+ linker flags for SELINUX, overriding pkg-config
102
103 Use these variables to override the choices made by `configure' or to help
104 it to find libraries and programs with nonstandard names/locations.
105@@ -4659,6 +4669,7 @@
106 as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
107 fi
108 fi
109+
110 # Check whether --enable-silent-rules was given.
111 if test "${enable_silent_rules+set}" = set; then :
112 enableval=$enable_silent_rules;
113@@ -15801,6 +15812,111 @@
114 fi
115
116
117+# Check whether --enable-selinux was given.
118+if test "${enable_selinux+set}" = set; then :
119+ enableval=$enable_selinux;
120+else
121+ enable_selinux=no
122+fi
123+
124+
125+if test "x$enable_selinux" = "xyes" ; then
126+
127+pkg_failed=no
128+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5
129+$as_echo_n "checking for SELINUX... " >&6; }
130+
131+if test -n "$SELINUX_CFLAGS"; then
132+ pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS"
133+ elif test -n "$PKG_CONFIG"; then
134+ if test -n "$PKG_CONFIG" && \
135+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5
136+ ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5
137+ ac_status=$?
138+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
139+ test $ac_status = 0; }; then
140+ pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null`
141+ test "x$?" != "x0" && pkg_failed=yes
142+else
143+ pkg_failed=yes
144+fi
145+ else
146+ pkg_failed=untried
147+fi
148+if test -n "$SELINUX_LIBS"; then
149+ pkg_cv_SELINUX_LIBS="$SELINUX_LIBS"
150+ elif test -n "$PKG_CONFIG"; then
151+ if test -n "$PKG_CONFIG" && \
152+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5
153+ ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5
154+ ac_status=$?
155+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
156+ test $ac_status = 0; }; then
157+ pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 2>/dev/null`
158+ test "x$?" != "x0" && pkg_failed=yes
159+else
160+ pkg_failed=yes
161+fi
162+ else
163+ pkg_failed=untried
164+fi
165+
166+
167+
168+if test $pkg_failed = yes; then
169+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
170+$as_echo "no" >&6; }
171+
172+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
173+ _pkg_short_errors_supported=yes
174+else
175+ _pkg_short_errors_supported=no
176+fi
177+ if test $_pkg_short_errors_supported = yes; then
178+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1`
179+ else
180+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1`
181+ fi
182+ # Put the nasty error message in config.log where it belongs
183+ echo "$SELINUX_PKG_ERRORS" >&5
184+
185+ as_fn_error $? "Package requirements (libselinux) were not met:
186+
187+$SELINUX_PKG_ERRORS
188+
189+Consider adjusting the PKG_CONFIG_PATH environment variable if you
190+installed software in a non-standard prefix.
191+
192+Alternatively, you may set the environment variables SELINUX_CFLAGS
193+and SELINUX_LIBS to avoid the need to call pkg-config.
194+See the pkg-config man page for more details." "$LINENO" 5
195+elif test $pkg_failed = untried; then
196+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
197+$as_echo "no" >&6; }
198+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
199+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
200+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
201+is in your PATH or set the PKG_CONFIG environment variable to the full
202+path to pkg-config.
203+
204+Alternatively, you may set the environment variables SELINUX_CFLAGS
205+and SELINUX_LIBS to avoid the need to call pkg-config.
206+See the pkg-config man page for more details.
207+
208+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
209+See \`config.log' for more details" "$LINENO" 5; }
210+else
211+ SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
212+ SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
213+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
214+$as_echo "yes" >&6; }
215+
216+fi
217+
218+$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
219+
220+fi
221+
222 # Checks for header files.
223 for ac_header in valgrind/valgrind.h, sys/prctl.h
224 do :
225
226=== modified file 'contrib/Makefile.in'
227--- contrib/Makefile.in 2014-07-14 12:48:09 +0000
228+++ contrib/Makefile.in 2014-08-27 23:03:20 +0000
229@@ -208,6 +208,8 @@
230 POSUB = @POSUB@
231 RANLIB = @RANLIB@
232 SED = @SED@
233+SELINUX_CFLAGS = @SELINUX_CFLAGS@
234+SELINUX_LIBS = @SELINUX_LIBS@
235 SET_MAKE = @SET_MAKE@
236 SHELL = @SHELL@
237 STRIP = @STRIP@
238
239=== modified file 'dbus/Makefile.in'
240--- dbus/Makefile.in 2014-07-14 12:48:09 +0000
241+++ dbus/Makefile.in 2014-08-27 23:03:20 +0000
242@@ -239,6 +239,8 @@
243 POSUB = @POSUB@
244 RANLIB = @RANLIB@
245 SED = @SED@
246+SELINUX_CFLAGS = @SELINUX_CFLAGS@
247+SELINUX_LIBS = @SELINUX_LIBS@
248 SET_MAKE = @SET_MAKE@
249 SHELL = @SHELL@
250 STRIP = @STRIP@
251
252=== modified file 'debian/changelog'
253--- debian/changelog 2014-08-06 12:07:27 +0000
254+++ debian/changelog 2014-08-27 23:03:20 +0000
255@@ -1,3 +1,9 @@
256+upstart (1.13.1-0ubuntu4) UNRELEASED; urgency=medium
257+
258+ * use different cgroup name for each upstart job type (LP: #1357252)
259+
260+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Wed, 27 Aug 2014 16:45:41 -0500
261+
262 upstart (1.13.1-0ubuntu3) utopic; urgency=medium
263
264 * Split upstart package into upstart & upstart-bin. (LP: #1351306)
265
266=== modified file 'doc/Makefile.in'
267--- doc/Makefile.in 2014-07-14 12:48:09 +0000
268+++ doc/Makefile.in 2014-08-27 23:03:20 +0000
269@@ -208,6 +208,8 @@
270 POSUB = @POSUB@
271 RANLIB = @RANLIB@
272 SED = @SED@
273+SELINUX_CFLAGS = @SELINUX_CFLAGS@
274+SELINUX_LIBS = @SELINUX_LIBS@
275 SET_MAKE = @SET_MAKE@
276 SHELL = @SHELL@
277 STRIP = @STRIP@
278
279=== modified file 'extra/Makefile.in'
280--- extra/Makefile.in 2014-07-14 12:48:09 +0000
281+++ extra/Makefile.in 2014-08-27 23:03:20 +0000
282@@ -430,6 +430,8 @@
283 POSUB = @POSUB@
284 RANLIB = @RANLIB@
285 SED = @SED@
286+SELINUX_CFLAGS = @SELINUX_CFLAGS@
287+SELINUX_LIBS = @SELINUX_LIBS@
288 SET_MAKE = @SET_MAKE@
289 SHELL = @SHELL@
290 STRIP = @STRIP@
291
292=== modified file 'init/Makefile.in'
293--- init/Makefile.in 2014-07-14 12:48:09 +0000
294+++ init/Makefile.in 2014-08-27 23:03:20 +0000
295@@ -101,8 +101,7 @@
296 @ENABLE_CGROUPS_TRUE@am__append_18 = cgroup.o $(CGMANAGER_LIBS)
297 subdir = init
298 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
299- $(top_srcdir)/depcomp $(dist_man_MANS) \
300- $(top_srcdir)/test-driver
301+ $(top_srcdir)/depcomp $(dist_man_MANS)
302 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
303 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
304 $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
305@@ -171,7 +170,8 @@
306 init_OBJECTS = $(am_init_OBJECTS) $(nodist_init_OBJECTS)
307 init_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
308 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
309- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
310+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
311+ $(am__DEPENDENCIES_1)
312 am_test_blocked_OBJECTS = test_blocked.$(OBJEXT)
313 test_blocked_OBJECTS = $(am_test_blocked_OBJECTS)
314 @ENABLE_CGROUPS_TRUE@am__DEPENDENCIES_3 = cgroup.o \
315@@ -493,160 +493,6 @@
316 std=''; \
317 fi; \
318 }
319-am__recheck_rx = ^[ ]*:recheck:[ ]*
320-am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
321-am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
322-# A command that, given a newline-separated list of test names on the
323-# standard input, print the name of the tests that are to be re-run
324-# upon "make recheck".
325-am__list_recheck_tests = $(AWK) '{ \
326- recheck = 1; \
327- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
328- { \
329- if (rc < 0) \
330- { \
331- if ((getline line2 < ($$0 ".log")) < 0) \
332- recheck = 0; \
333- break; \
334- } \
335- else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
336- { \
337- recheck = 0; \
338- break; \
339- } \
340- else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
341- { \
342- break; \
343- } \
344- }; \
345- if (recheck) \
346- print $$0; \
347- close ($$0 ".trs"); \
348- close ($$0 ".log"); \
349-}'
350-# A command that, given a newline-separated list of test names on the
351-# standard input, create the global log from their .trs and .log files.
352-am__create_global_log = $(AWK) ' \
353-function fatal(msg) \
354-{ \
355- print "fatal: making $@: " msg | "cat >&2"; \
356- exit 1; \
357-} \
358-function rst_section(header) \
359-{ \
360- print header; \
361- len = length(header); \
362- for (i = 1; i <= len; i = i + 1) \
363- printf "="; \
364- printf "\n\n"; \
365-} \
366-{ \
367- copy_in_global_log = 1; \
368- global_test_result = "RUN"; \
369- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
370- { \
371- if (rc < 0) \
372- fatal("failed to read from " $$0 ".trs"); \
373- if (line ~ /$(am__global_test_result_rx)/) \
374- { \
375- sub("$(am__global_test_result_rx)", "", line); \
376- sub("[ ]*$$", "", line); \
377- global_test_result = line; \
378- } \
379- else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
380- copy_in_global_log = 0; \
381- }; \
382- if (copy_in_global_log) \
383- { \
384- rst_section(global_test_result ": " $$0); \
385- while ((rc = (getline line < ($$0 ".log"))) != 0) \
386- { \
387- if (rc < 0) \
388- fatal("failed to read from " $$0 ".log"); \
389- print line; \
390- }; \
391- printf "\n"; \
392- }; \
393- close ($$0 ".trs"); \
394- close ($$0 ".log"); \
395-}'
396-# Restructured Text title.
397-am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
398-# Solaris 10 'make', and several other traditional 'make' implementations,
399-# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
400-# by disabling -e (using the XSI extension "set +e") if it's set.
401-am__sh_e_setup = case $$- in *e*) set +e;; esac
402-# Default flags passed to test drivers.
403-am__common_driver_flags = \
404- --color-tests "$$am__color_tests" \
405- --enable-hard-errors "$$am__enable_hard_errors" \
406- --expect-failure "$$am__expect_failure"
407-# To be inserted before the command running the test. Creates the
408-# directory for the log if needed. Stores in $dir the directory
409-# containing $f, in $tst the test, in $log the log. Executes the
410-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
411-# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
412-# will run the test scripts (or their associated LOG_COMPILER, if
413-# thy have one).
414-am__check_pre = \
415-$(am__sh_e_setup); \
416-$(am__vpath_adj_setup) $(am__vpath_adj) \
417-$(am__tty_colors); \
418-srcdir=$(srcdir); export srcdir; \
419-case "$@" in \
420- */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
421- *) am__odir=.;; \
422-esac; \
423-test "x$$am__odir" = x"." || test -d "$$am__odir" \
424- || $(MKDIR_P) "$$am__odir" || exit $$?; \
425-if test -f "./$$f"; then dir=./; \
426-elif test -f "$$f"; then dir=; \
427-else dir="$(srcdir)/"; fi; \
428-tst=$$dir$$f; log='$@'; \
429-if test -n '$(DISABLE_HARD_ERRORS)'; then \
430- am__enable_hard_errors=no; \
431-else \
432- am__enable_hard_errors=yes; \
433-fi; \
434-case " $(XFAIL_TESTS) " in \
435- *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
436- am__expect_failure=yes;; \
437- *) \
438- am__expect_failure=no;; \
439-esac; \
440-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
441-# A shell command to get the names of the tests scripts with any registered
442-# extension removed (i.e., equivalently, the names of the test logs, with
443-# the '.log' extension removed). The result is saved in the shell variable
444-# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
445-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
446-# since that might cause problem with VPATH rewrites for suffix-less tests.
447-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
448-am__set_TESTS_bases = \
449- bases='$(TEST_LOGS)'; \
450- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
451- bases=`echo $$bases`
452-RECHECK_LOGS = $(TEST_LOGS)
453-AM_RECURSIVE_TARGETS = check recheck
454-TEST_SUITE_LOG = test-suite.log
455-TEST_EXTENSIONS = @EXEEXT@ .test
456-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
457-am__set_b = \
458- case '$@' in \
459- */*) \
460- case '$*' in \
461- */*) b='$*';; \
462- *) b=`echo '$@' | sed 's/\.log$$//'`; \
463- esac;; \
464- *) \
465- b='$*';; \
466- esac
467-am__test_logs1 = $(TESTS:=.log)
468-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
469-TEST_LOGS = $(am__test_logs2:.test.log=.log)
470-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
471-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
472- $(TEST_LOG_FLAGS)
473 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
474 ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@
475 ACLOCAL = @ACLOCAL@
476@@ -740,6 +586,8 @@
477 POSUB = @POSUB@
478 RANLIB = @RANLIB@
479 SED = @SED@
480+SELINUX_CFLAGS = @SELINUX_CFLAGS@
481+SELINUX_LIBS = @SELINUX_LIBS@
482 SET_MAKE = @SET_MAKE@
483 SHELL = @SHELL@
484 STRIP = @STRIP@
485@@ -808,6 +656,7 @@
486 $(NIH_CFLAGS) \
487 $(NIH_DBUS_CFLAGS) \
488 $(DBUS_CFLAGS) \
489+ $(SELINUX_CFLAGS) \
490 $(JSON_CFLAGS) \
491 $(CGMANAGER_CFLAGS)
492
493@@ -852,6 +701,7 @@
494 $(NIH_LIBS) \
495 $(NIH_DBUS_LIBS) \
496 $(DBUS_LIBS) \
497+ $(SELINUX_LIBS) \
498 $(JSON_LIBS) \
499 $(CGMANAGER_LIBS) \
500 -lrt
501@@ -1092,7 +942,7 @@
502 $(MAKE) $(AM_MAKEFLAGS) all-am
503
504 .SUFFIXES:
505-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
506+.SUFFIXES: .c .lo .o .obj
507 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
508 @for dep in $?; do \
509 case '$(am__configure_deps)' in \
510@@ -1827,294 +1677,98 @@
511 distclean-tags:
512 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
513
514-# Recover from deleted '.trs' file; this should ensure that
515-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
516-# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
517-# to avoid problems with "make -n".
518-.log.trs:
519- rm -f $< $@
520- $(MAKE) $(AM_MAKEFLAGS) $<
521-
522-# Leading 'am--fnord' is there to ensure the list of targets does not
523-# expand to empty, as could happen e.g. with make check TESTS=''.
524-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
525-am--force-recheck:
526- @:
527-
528-$(TEST_SUITE_LOG): $(TEST_LOGS)
529- @$(am__set_TESTS_bases); \
530- am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
531- redo_bases=`for i in $$bases; do \
532- am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
533- done`; \
534- if test -n "$$redo_bases"; then \
535- redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
536- redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
537- if $(am__make_dryrun); then :; else \
538- rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
539- fi; \
540- fi; \
541- if test -n "$$am__remaking_logs"; then \
542- echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
543- "recursion detected" >&2; \
544- else \
545- am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
546- fi; \
547- if $(am__make_dryrun); then :; else \
548- st=0; \
549- errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
550- for i in $$redo_bases; do \
551- test -f $$i.trs && test -r $$i.trs \
552- || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
553- test -f $$i.log && test -r $$i.log \
554- || { echo "$$errmsg $$i.log" >&2; st=1; }; \
555+check-TESTS: $(TESTS)
556+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
557+ srcdir=$(srcdir); export srcdir; \
558+ list=' $(TESTS) '; \
559+ $(am__tty_colors); \
560+ if test -n "$$list"; then \
561+ for tst in $$list; do \
562+ if test -f ./$$tst; then dir=./; \
563+ elif test -f $$tst; then dir=; \
564+ else dir="$(srcdir)/"; fi; \
565+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
566+ all=`expr $$all + 1`; \
567+ case " $(XFAIL_TESTS) " in \
568+ *[\ \ ]$$tst[\ \ ]*) \
569+ xpass=`expr $$xpass + 1`; \
570+ failed=`expr $$failed + 1`; \
571+ col=$$red; res=XPASS; \
572+ ;; \
573+ *) \
574+ col=$$grn; res=PASS; \
575+ ;; \
576+ esac; \
577+ elif test $$? -ne 77; then \
578+ all=`expr $$all + 1`; \
579+ case " $(XFAIL_TESTS) " in \
580+ *[\ \ ]$$tst[\ \ ]*) \
581+ xfail=`expr $$xfail + 1`; \
582+ col=$$lgn; res=XFAIL; \
583+ ;; \
584+ *) \
585+ failed=`expr $$failed + 1`; \
586+ col=$$red; res=FAIL; \
587+ ;; \
588+ esac; \
589+ else \
590+ skip=`expr $$skip + 1`; \
591+ col=$$blu; res=SKIP; \
592+ fi; \
593+ echo "$${col}$$res$${std}: $$tst"; \
594 done; \
595- test $$st -eq 0 || exit 1; \
596- fi
597- @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
598- ws='[ ]'; \
599- results=`for b in $$bases; do echo $$b.trs; done`; \
600- test -n "$$results" || results=/dev/null; \
601- all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
602- pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
603- fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
604- skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
605- xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
606- xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
607- error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
608- if test `expr $$fail + $$xpass + $$error` -eq 0; then \
609- success=true; \
610- else \
611- success=false; \
612- fi; \
613- br='==================='; br=$$br$$br$$br$$br; \
614- result_count () \
615- { \
616- if test x"$$1" = x"--maybe-color"; then \
617- maybe_colorize=yes; \
618- elif test x"$$1" = x"--no-color"; then \
619- maybe_colorize=no; \
620- else \
621- echo "$@: invalid 'result_count' usage" >&2; exit 4; \
622- fi; \
623- shift; \
624- desc=$$1 count=$$2; \
625- if test $$maybe_colorize = yes && test $$count -gt 0; then \
626- color_start=$$3 color_end=$$std; \
627- else \
628- color_start= color_end=; \
629- fi; \
630- echo "$${color_start}# $$desc $$count$${color_end}"; \
631- }; \
632- create_testsuite_report () \
633- { \
634- result_count $$1 "TOTAL:" $$all "$$brg"; \
635- result_count $$1 "PASS: " $$pass "$$grn"; \
636- result_count $$1 "SKIP: " $$skip "$$blu"; \
637- result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
638- result_count $$1 "FAIL: " $$fail "$$red"; \
639- result_count $$1 "XPASS:" $$xpass "$$red"; \
640- result_count $$1 "ERROR:" $$error "$$mgn"; \
641- }; \
642- { \
643- echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
644- $(am__rst_title); \
645- create_testsuite_report --no-color; \
646- echo; \
647- echo ".. contents:: :depth: 2"; \
648- echo; \
649- for b in $$bases; do echo $$b; done \
650- | $(am__create_global_log); \
651- } >$(TEST_SUITE_LOG).tmp || exit 1; \
652- mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
653- if $$success; then \
654- col="$$grn"; \
655- else \
656- col="$$red"; \
657- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
658- fi; \
659- echo "$${col}$$br$${std}"; \
660- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
661- echo "$${col}$$br$${std}"; \
662- create_testsuite_report --maybe-color; \
663- echo "$$col$$br$$std"; \
664- if $$success; then :; else \
665- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
666- if test -n "$(PACKAGE_BUGREPORT)"; then \
667- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
668- fi; \
669- echo "$$col$$br$$std"; \
670- fi; \
671- $$success || exit 1
672-
673-check-TESTS:
674- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
675- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
676- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
677- @set +e; $(am__set_TESTS_bases); \
678- log_list=`for i in $$bases; do echo $$i.log; done`; \
679- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
680- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
681- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
682- exit $$?;
683-recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_SCRIPTS)
684- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
685- @set +e; $(am__set_TESTS_bases); \
686- bases=`for i in $$bases; do echo $$i; done \
687- | $(am__list_recheck_tests)` || exit 1; \
688- log_list=`for i in $$bases; do echo $$i.log; done`; \
689- log_list=`echo $$log_list`; \
690- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
691- am__force_recheck=am--force-recheck \
692- TEST_LOGS="$$log_list"; \
693- exit $$?
694-test_system.log: test_system$(EXEEXT)
695- @p='test_system$(EXEEXT)'; \
696- b='test_system'; \
697- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
698- --log-file $$b.log --trs-file $$b.trs \
699- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
700- "$$tst" $(AM_TESTS_FD_REDIRECT)
701-test_environ.log: test_environ$(EXEEXT)
702- @p='test_environ$(EXEEXT)'; \
703- b='test_environ'; \
704- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
705- --log-file $$b.log --trs-file $$b.trs \
706- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
707- "$$tst" $(AM_TESTS_FD_REDIRECT)
708-test_process.log: test_process$(EXEEXT)
709- @p='test_process$(EXEEXT)'; \
710- b='test_process'; \
711- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
712- --log-file $$b.log --trs-file $$b.trs \
713- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
714- "$$tst" $(AM_TESTS_FD_REDIRECT)
715-test_job_class.log: test_job_class$(EXEEXT)
716- @p='test_job_class$(EXEEXT)'; \
717- b='test_job_class'; \
718- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
719- --log-file $$b.log --trs-file $$b.trs \
720- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
721- "$$tst" $(AM_TESTS_FD_REDIRECT)
722-test_job_process.log: test_job_process$(EXEEXT)
723- @p='test_job_process$(EXEEXT)'; \
724- b='test_job_process'; \
725- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
726- --log-file $$b.log --trs-file $$b.trs \
727- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
728- "$$tst" $(AM_TESTS_FD_REDIRECT)
729-test_job.log: test_job$(EXEEXT)
730- @p='test_job$(EXEEXT)'; \
731- b='test_job'; \
732- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
733- --log-file $$b.log --trs-file $$b.trs \
734- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
735- "$$tst" $(AM_TESTS_FD_REDIRECT)
736-test_log.log: test_log$(EXEEXT)
737- @p='test_log$(EXEEXT)'; \
738- b='test_log'; \
739- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
740- --log-file $$b.log --trs-file $$b.trs \
741- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
742- "$$tst" $(AM_TESTS_FD_REDIRECT)
743-test_state.log: test_state$(EXEEXT)
744- @p='test_state$(EXEEXT)'; \
745- b='test_state'; \
746- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
747- --log-file $$b.log --trs-file $$b.trs \
748- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
749- "$$tst" $(AM_TESTS_FD_REDIRECT)
750-test_event.log: test_event$(EXEEXT)
751- @p='test_event$(EXEEXT)'; \
752- b='test_event'; \
753- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
754- --log-file $$b.log --trs-file $$b.trs \
755- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
756- "$$tst" $(AM_TESTS_FD_REDIRECT)
757-test_event_operator.log: test_event_operator$(EXEEXT)
758- @p='test_event_operator$(EXEEXT)'; \
759- b='test_event_operator'; \
760- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
761- --log-file $$b.log --trs-file $$b.trs \
762- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
763- "$$tst" $(AM_TESTS_FD_REDIRECT)
764-test_blocked.log: test_blocked$(EXEEXT)
765- @p='test_blocked$(EXEEXT)'; \
766- b='test_blocked'; \
767- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
768- --log-file $$b.log --trs-file $$b.trs \
769- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
770- "$$tst" $(AM_TESTS_FD_REDIRECT)
771-test_parse_job.log: test_parse_job$(EXEEXT)
772- @p='test_parse_job$(EXEEXT)'; \
773- b='test_parse_job'; \
774- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
775- --log-file $$b.log --trs-file $$b.trs \
776- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
777- "$$tst" $(AM_TESTS_FD_REDIRECT)
778-test_parse_conf.log: test_parse_conf$(EXEEXT)
779- @p='test_parse_conf$(EXEEXT)'; \
780- b='test_parse_conf'; \
781- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
782- --log-file $$b.log --trs-file $$b.trs \
783- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
784- "$$tst" $(AM_TESTS_FD_REDIRECT)
785-test_conf_static.log: test_conf_static$(EXEEXT)
786- @p='test_conf_static$(EXEEXT)'; \
787- b='test_conf_static'; \
788- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
789- --log-file $$b.log --trs-file $$b.trs \
790- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
791- "$$tst" $(AM_TESTS_FD_REDIRECT)
792-test_xdg.log: test_xdg$(EXEEXT)
793- @p='test_xdg$(EXEEXT)'; \
794- b='test_xdg'; \
795- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
796- --log-file $$b.log --trs-file $$b.trs \
797- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
798- "$$tst" $(AM_TESTS_FD_REDIRECT)
799-test_control.log: test_control$(EXEEXT)
800- @p='test_control$(EXEEXT)'; \
801- b='test_control'; \
802- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
803- --log-file $$b.log --trs-file $$b.trs \
804- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
805- "$$tst" $(AM_TESTS_FD_REDIRECT)
806-test_main.log: test_main$(EXEEXT)
807- @p='test_main$(EXEEXT)'; \
808- b='test_main'; \
809- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
810- --log-file $$b.log --trs-file $$b.trs \
811- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
812- "$$tst" $(AM_TESTS_FD_REDIRECT)
813-test_cgroup.log: test_cgroup$(EXEEXT)
814- @p='test_cgroup$(EXEEXT)'; \
815- b='test_cgroup'; \
816- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
817- --log-file $$b.log --trs-file $$b.trs \
818- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
819- "$$tst" $(AM_TESTS_FD_REDIRECT)
820-test_conf_preload.sh.log: test_conf_preload.sh$(EXEEXT)
821- @p='test_conf_preload.sh$(EXEEXT)'; \
822- b='test_conf_preload.sh'; \
823- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
824- --log-file $$b.log --trs-file $$b.trs \
825- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
826- "$$tst" $(AM_TESTS_FD_REDIRECT)
827-.test.log:
828- @p='$<'; \
829- $(am__set_b); \
830- $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
831- --log-file $$b.log --trs-file $$b.trs \
832- $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
833- "$$tst" $(AM_TESTS_FD_REDIRECT)
834-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
835-@am__EXEEXT_TRUE@ @p='$<'; \
836-@am__EXEEXT_TRUE@ $(am__set_b); \
837-@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
838-@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
839-@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
840-@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
841+ if test "$$all" -eq 1; then \
842+ tests="test"; \
843+ All=""; \
844+ else \
845+ tests="tests"; \
846+ All="All "; \
847+ fi; \
848+ if test "$$failed" -eq 0; then \
849+ if test "$$xfail" -eq 0; then \
850+ banner="$$All$$all $$tests passed"; \
851+ else \
852+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
853+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
854+ fi; \
855+ else \
856+ if test "$$xpass" -eq 0; then \
857+ banner="$$failed of $$all $$tests failed"; \
858+ else \
859+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
860+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
861+ fi; \
862+ fi; \
863+ dashes="$$banner"; \
864+ skipped=""; \
865+ if test "$$skip" -ne 0; then \
866+ if test "$$skip" -eq 1; then \
867+ skipped="($$skip test was not run)"; \
868+ else \
869+ skipped="($$skip tests were not run)"; \
870+ fi; \
871+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
872+ dashes="$$skipped"; \
873+ fi; \
874+ report=""; \
875+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
876+ report="Please report to $(PACKAGE_BUGREPORT)"; \
877+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
878+ dashes="$$report"; \
879+ fi; \
880+ dashes=`echo "$$dashes" | sed s/./=/g`; \
881+ if test "$$failed" -eq 0; then \
882+ col="$$grn"; \
883+ else \
884+ col="$$red"; \
885+ fi; \
886+ echo "$${col}$$dashes$${std}"; \
887+ echo "$${col}$$banner$${std}"; \
888+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
889+ test -z "$$report" || echo "$${col}$$report$${std}"; \
890+ echo "$${col}$$dashes$${std}"; \
891+ test "$$failed" -eq 0; \
892+ else :; fi
893
894 distdir: $(DISTFILES)
895 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
896@@ -2178,9 +1832,6 @@
897 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
898 fi
899 mostlyclean-generic:
900- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
901- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
902- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
903
904 clean-generic:
905 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
906@@ -2284,9 +1935,9 @@
907 installcheck installcheck-am installdirs maintainer-clean \
908 maintainer-clean-generic maintainer-clean-local mostlyclean \
909 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
910- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
911- uninstall-am uninstall-man uninstall-man5 uninstall-man7 \
912- uninstall-man8 uninstall-sbinPROGRAMS
913+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
914+ uninstall-man uninstall-man5 uninstall-man7 uninstall-man8 \
915+ uninstall-sbinPROGRAMS
916
917
918 $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
919
920=== modified file 'init/cgroup.c'
921--- init/cgroup.c 2014-07-01 13:17:52 +0000
922+++ init/cgroup.c 2014-08-27 23:03:20 +0000
923@@ -316,7 +316,8 @@
924 * Returns: TRUE on success, FALSE on raised error.
925 **/
926 int
927-cgroup_setup (NihList *cgroups, char * const *env, uid_t uid, gid_t gid)
928+cgroup_setup (NihList *cgroups, int type, char * const *env,
929+ uid_t uid, gid_t gid)
930 {
931 const char *upstart_job = NULL;
932 const char *upstart_instance = NULL;
933@@ -427,6 +428,8 @@
934 ? cgname->expanded + strlen (UPSTART_CGROUP_SHELL_ENVVAR)
935 : cgname->expanded);
936
937+ NIH_MUST(nih_strcat_sprintf(&cgname->expanded, cgname, "_%d", type));
938+
939 if (! strcmp (cgname->name, cgname->expanded)) {
940 /* expanded value is the same as the
941 * original, so don't bother storing the
942
943=== modified file 'init/cgroup.h'
944--- init/cgroup.h 2014-07-01 13:11:34 +0000
945+++ init/cgroup.h 2014-08-27 23:03:20 +0000
946@@ -172,7 +172,7 @@
947 int cgroup_manager_available (void)
948 __attribute__ ((warn_unused_result));
949
950-int cgroup_setup (NihList *cgroups, char * const *env,
951+int cgroup_setup (NihList *cgroups, int type, char * const *env,
952 uid_t uid, gid_t gid)
953 __attribute__ ((warn_unused_result));
954
955
956=== modified file 'init/job_process.c'
957--- init/job_process.c 2014-07-14 12:48:09 +0000
958+++ init/job_process.c 2014-08-27 23:03:20 +0000
959@@ -883,7 +883,7 @@
960 if (cgroup_manager_connect () < 0)
961 job_process_error_abort (fds[1], JOB_PROCESS_ERROR_CGROUP_MGR_CONNECT, 0);
962
963- if (! cgroup_setup (&job->class->cgroups,
964+ if (! cgroup_setup (&job->class->cgroups, (int)process,
965 env,
966 class->setuid ? job_setuid : geteuid (),
967 class->setgid ? job_setgid : getegid ())) {
968
969=== removed file 'init/tests/libwrap_inotify.la'
970--- init/tests/libwrap_inotify.la 2014-07-14 12:42:33 +0000
971+++ init/tests/libwrap_inotify.la 1970-01-01 00:00:00 +0000
972@@ -1,41 +0,0 @@
973-# libwrap_inotify.la - a libtool library file
974-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
975-#
976-# Please DO NOT delete this file!
977-# It is necessary for linking the library.
978-
979-# The name that we can dlopen(3).
980-dlname='libwrap_inotify.so.0'
981-
982-# Names of this library.
983-library_names='libwrap_inotify.so.0.0.0 libwrap_inotify.so.0 libwrap_inotify.so'
984-
985-# The name of the static archive.
986-old_library=''
987-
988-# Linker flags that can not go in dependency_libs.
989-inherited_linker_flags=''
990-
991-# Libraries that this one depends upon.
992-dependency_libs=' -lrt -ldl -lcgmanager -lnih -lnih-dbus -ldbus-1'
993-
994-# Names of additional weak libraries provided by this library
995-weak_library_names=''
996-
997-# Version information for libwrap_inotify.
998-current=0
999-age=0
1000-revision=0
1001-
1002-# Is this an already installed library?
1003-installed=no
1004-
1005-# Should we warn about portability when linking against -modules?
1006-shouldnotlink=yes
1007-
1008-# Files to dlopen/dlpreopen
1009-dlopen=''
1010-dlpreopen=''
1011-
1012-# Directory that this library needs to be installed in:
1013-libdir='/nowhere'
1014
1015=== modified file 'lib/Makefile.in'
1016--- lib/Makefile.in 2014-07-14 12:48:09 +0000
1017+++ lib/Makefile.in 2014-08-27 23:03:20 +0000
1018@@ -86,8 +86,7 @@
1019 subdir = lib
1020 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
1021 $(srcdir)/libupstart.pc.in.in $(top_srcdir)/depcomp \
1022- $(include_HEADERS) $(upstartinclude_HEADERS) \
1023- $(top_srcdir)/test-driver
1024+ $(include_HEADERS) $(upstartinclude_HEADERS)
1025 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1026 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
1027 $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
1028@@ -249,160 +248,6 @@
1029 std=''; \
1030 fi; \
1031 }
1032-am__recheck_rx = ^[ ]*:recheck:[ ]*
1033-am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
1034-am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
1035-# A command that, given a newline-separated list of test names on the
1036-# standard input, print the name of the tests that are to be re-run
1037-# upon "make recheck".
1038-am__list_recheck_tests = $(AWK) '{ \
1039- recheck = 1; \
1040- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
1041- { \
1042- if (rc < 0) \
1043- { \
1044- if ((getline line2 < ($$0 ".log")) < 0) \
1045- recheck = 0; \
1046- break; \
1047- } \
1048- else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
1049- { \
1050- recheck = 0; \
1051- break; \
1052- } \
1053- else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
1054- { \
1055- break; \
1056- } \
1057- }; \
1058- if (recheck) \
1059- print $$0; \
1060- close ($$0 ".trs"); \
1061- close ($$0 ".log"); \
1062-}'
1063-# A command that, given a newline-separated list of test names on the
1064-# standard input, create the global log from their .trs and .log files.
1065-am__create_global_log = $(AWK) ' \
1066-function fatal(msg) \
1067-{ \
1068- print "fatal: making $@: " msg | "cat >&2"; \
1069- exit 1; \
1070-} \
1071-function rst_section(header) \
1072-{ \
1073- print header; \
1074- len = length(header); \
1075- for (i = 1; i <= len; i = i + 1) \
1076- printf "="; \
1077- printf "\n\n"; \
1078-} \
1079-{ \
1080- copy_in_global_log = 1; \
1081- global_test_result = "RUN"; \
1082- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
1083- { \
1084- if (rc < 0) \
1085- fatal("failed to read from " $$0 ".trs"); \
1086- if (line ~ /$(am__global_test_result_rx)/) \
1087- { \
1088- sub("$(am__global_test_result_rx)", "", line); \
1089- sub("[ ]*$$", "", line); \
1090- global_test_result = line; \
1091- } \
1092- else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
1093- copy_in_global_log = 0; \
1094- }; \
1095- if (copy_in_global_log) \
1096- { \
1097- rst_section(global_test_result ": " $$0); \
1098- while ((rc = (getline line < ($$0 ".log"))) != 0) \
1099- { \
1100- if (rc < 0) \
1101- fatal("failed to read from " $$0 ".log"); \
1102- print line; \
1103- }; \
1104- printf "\n"; \
1105- }; \
1106- close ($$0 ".trs"); \
1107- close ($$0 ".log"); \
1108-}'
1109-# Restructured Text title.
1110-am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
1111-# Solaris 10 'make', and several other traditional 'make' implementations,
1112-# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
1113-# by disabling -e (using the XSI extension "set +e") if it's set.
1114-am__sh_e_setup = case $$- in *e*) set +e;; esac
1115-# Default flags passed to test drivers.
1116-am__common_driver_flags = \
1117- --color-tests "$$am__color_tests" \
1118- --enable-hard-errors "$$am__enable_hard_errors" \
1119- --expect-failure "$$am__expect_failure"
1120-# To be inserted before the command running the test. Creates the
1121-# directory for the log if needed. Stores in $dir the directory
1122-# containing $f, in $tst the test, in $log the log. Executes the
1123-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
1124-# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
1125-# will run the test scripts (or their associated LOG_COMPILER, if
1126-# thy have one).
1127-am__check_pre = \
1128-$(am__sh_e_setup); \
1129-$(am__vpath_adj_setup) $(am__vpath_adj) \
1130-$(am__tty_colors); \
1131-srcdir=$(srcdir); export srcdir; \
1132-case "$@" in \
1133- */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
1134- *) am__odir=.;; \
1135-esac; \
1136-test "x$$am__odir" = x"." || test -d "$$am__odir" \
1137- || $(MKDIR_P) "$$am__odir" || exit $$?; \
1138-if test -f "./$$f"; then dir=./; \
1139-elif test -f "$$f"; then dir=; \
1140-else dir="$(srcdir)/"; fi; \
1141-tst=$$dir$$f; log='$@'; \
1142-if test -n '$(DISABLE_HARD_ERRORS)'; then \
1143- am__enable_hard_errors=no; \
1144-else \
1145- am__enable_hard_errors=yes; \
1146-fi; \
1147-case " $(XFAIL_TESTS) " in \
1148- *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
1149- am__expect_failure=yes;; \
1150- *) \
1151- am__expect_failure=no;; \
1152-esac; \
1153-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
1154-# A shell command to get the names of the tests scripts with any registered
1155-# extension removed (i.e., equivalently, the names of the test logs, with
1156-# the '.log' extension removed). The result is saved in the shell variable
1157-# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
1158-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
1159-# since that might cause problem with VPATH rewrites for suffix-less tests.
1160-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
1161-am__set_TESTS_bases = \
1162- bases='$(TEST_LOGS)'; \
1163- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
1164- bases=`echo $$bases`
1165-RECHECK_LOGS = $(TEST_LOGS)
1166-AM_RECURSIVE_TARGETS = check recheck
1167-TEST_SUITE_LOG = test-suite.log
1168-TEST_EXTENSIONS = @EXEEXT@ .test
1169-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
1170-am__set_b = \
1171- case '$@' in \
1172- */*) \
1173- case '$*' in \
1174- */*) b='$*';; \
1175- *) b=`echo '$@' | sed 's/\.log$$//'`; \
1176- esac;; \
1177- *) \
1178- b='$*';; \
1179- esac
1180-am__test_logs1 = $(TESTS:=.log)
1181-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
1182-TEST_LOGS = $(am__test_logs2:.test.log=.log)
1183-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
1184-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
1185- $(TEST_LOG_FLAGS)
1186 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1187 ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@
1188 ACLOCAL = @ACLOCAL@
1189@@ -496,6 +341,8 @@
1190 POSUB = @POSUB@
1191 RANLIB = @RANLIB@
1192 SED = @SED@
1193+SELINUX_CFLAGS = @SELINUX_CFLAGS@
1194+SELINUX_LIBS = @SELINUX_LIBS@
1195 SET_MAKE = @SET_MAKE@
1196 SHELL = @SHELL@
1197 STRIP = @STRIP@
1198@@ -665,7 +512,7 @@
1199 $(MAKE) $(AM_MAKEFLAGS) all-am
1200
1201 .SUFFIXES:
1202-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
1203+.SUFFIXES: .c .lo .o .obj
1204 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
1205 @for dep in $?; do \
1206 case '$(am__configure_deps)' in \
1207@@ -938,168 +785,98 @@
1208 distclean-tags:
1209 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1210
1211-# Recover from deleted '.trs' file; this should ensure that
1212-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
1213-# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
1214-# to avoid problems with "make -n".
1215-.log.trs:
1216- rm -f $< $@
1217- $(MAKE) $(AM_MAKEFLAGS) $<
1218-
1219-# Leading 'am--fnord' is there to ensure the list of targets does not
1220-# expand to empty, as could happen e.g. with make check TESTS=''.
1221-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
1222-am--force-recheck:
1223- @:
1224-
1225-$(TEST_SUITE_LOG): $(TEST_LOGS)
1226- @$(am__set_TESTS_bases); \
1227- am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
1228- redo_bases=`for i in $$bases; do \
1229- am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
1230- done`; \
1231- if test -n "$$redo_bases"; then \
1232- redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
1233- redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
1234- if $(am__make_dryrun); then :; else \
1235- rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
1236- fi; \
1237- fi; \
1238- if test -n "$$am__remaking_logs"; then \
1239- echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
1240- "recursion detected" >&2; \
1241- else \
1242- am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
1243- fi; \
1244- if $(am__make_dryrun); then :; else \
1245- st=0; \
1246- errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
1247- for i in $$redo_bases; do \
1248- test -f $$i.trs && test -r $$i.trs \
1249- || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
1250- test -f $$i.log && test -r $$i.log \
1251- || { echo "$$errmsg $$i.log" >&2; st=1; }; \
1252+check-TESTS: $(TESTS)
1253+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
1254+ srcdir=$(srcdir); export srcdir; \
1255+ list=' $(TESTS) '; \
1256+ $(am__tty_colors); \
1257+ if test -n "$$list"; then \
1258+ for tst in $$list; do \
1259+ if test -f ./$$tst; then dir=./; \
1260+ elif test -f $$tst; then dir=; \
1261+ else dir="$(srcdir)/"; fi; \
1262+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
1263+ all=`expr $$all + 1`; \
1264+ case " $(XFAIL_TESTS) " in \
1265+ *[\ \ ]$$tst[\ \ ]*) \
1266+ xpass=`expr $$xpass + 1`; \
1267+ failed=`expr $$failed + 1`; \
1268+ col=$$red; res=XPASS; \
1269+ ;; \
1270+ *) \
1271+ col=$$grn; res=PASS; \
1272+ ;; \
1273+ esac; \
1274+ elif test $$? -ne 77; then \
1275+ all=`expr $$all + 1`; \
1276+ case " $(XFAIL_TESTS) " in \
1277+ *[\ \ ]$$tst[\ \ ]*) \
1278+ xfail=`expr $$xfail + 1`; \
1279+ col=$$lgn; res=XFAIL; \
1280+ ;; \
1281+ *) \
1282+ failed=`expr $$failed + 1`; \
1283+ col=$$red; res=FAIL; \
1284+ ;; \
1285+ esac; \
1286+ else \
1287+ skip=`expr $$skip + 1`; \
1288+ col=$$blu; res=SKIP; \
1289+ fi; \
1290+ echo "$${col}$$res$${std}: $$tst"; \
1291 done; \
1292- test $$st -eq 0 || exit 1; \
1293- fi
1294- @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
1295- ws='[ ]'; \
1296- results=`for b in $$bases; do echo $$b.trs; done`; \
1297- test -n "$$results" || results=/dev/null; \
1298- all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
1299- pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
1300- fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
1301- skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
1302- xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
1303- xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
1304- error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
1305- if test `expr $$fail + $$xpass + $$error` -eq 0; then \
1306- success=true; \
1307- else \
1308- success=false; \
1309- fi; \
1310- br='==================='; br=$$br$$br$$br$$br; \
1311- result_count () \
1312- { \
1313- if test x"$$1" = x"--maybe-color"; then \
1314- maybe_colorize=yes; \
1315- elif test x"$$1" = x"--no-color"; then \
1316- maybe_colorize=no; \
1317- else \
1318- echo "$@: invalid 'result_count' usage" >&2; exit 4; \
1319- fi; \
1320- shift; \
1321- desc=$$1 count=$$2; \
1322- if test $$maybe_colorize = yes && test $$count -gt 0; then \
1323- color_start=$$3 color_end=$$std; \
1324- else \
1325- color_start= color_end=; \
1326- fi; \
1327- echo "$${color_start}# $$desc $$count$${color_end}"; \
1328- }; \
1329- create_testsuite_report () \
1330- { \
1331- result_count $$1 "TOTAL:" $$all "$$brg"; \
1332- result_count $$1 "PASS: " $$pass "$$grn"; \
1333- result_count $$1 "SKIP: " $$skip "$$blu"; \
1334- result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
1335- result_count $$1 "FAIL: " $$fail "$$red"; \
1336- result_count $$1 "XPASS:" $$xpass "$$red"; \
1337- result_count $$1 "ERROR:" $$error "$$mgn"; \
1338- }; \
1339- { \
1340- echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
1341- $(am__rst_title); \
1342- create_testsuite_report --no-color; \
1343- echo; \
1344- echo ".. contents:: :depth: 2"; \
1345- echo; \
1346- for b in $$bases; do echo $$b; done \
1347- | $(am__create_global_log); \
1348- } >$(TEST_SUITE_LOG).tmp || exit 1; \
1349- mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
1350- if $$success; then \
1351- col="$$grn"; \
1352- else \
1353- col="$$red"; \
1354- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
1355- fi; \
1356- echo "$${col}$$br$${std}"; \
1357- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
1358- echo "$${col}$$br$${std}"; \
1359- create_testsuite_report --maybe-color; \
1360- echo "$$col$$br$$std"; \
1361- if $$success; then :; else \
1362- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
1363- if test -n "$(PACKAGE_BUGREPORT)"; then \
1364- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
1365- fi; \
1366- echo "$$col$$br$$std"; \
1367- fi; \
1368- $$success || exit 1
1369-
1370-check-TESTS:
1371- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
1372- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
1373- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1374- @set +e; $(am__set_TESTS_bases); \
1375- log_list=`for i in $$bases; do echo $$i.log; done`; \
1376- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
1377- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
1378- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
1379- exit $$?;
1380-recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
1381- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1382- @set +e; $(am__set_TESTS_bases); \
1383- bases=`for i in $$bases; do echo $$i; done \
1384- | $(am__list_recheck_tests)` || exit 1; \
1385- log_list=`for i in $$bases; do echo $$i.log; done`; \
1386- log_list=`echo $$log_list`; \
1387- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
1388- am__force_recheck=am--force-recheck \
1389- TEST_LOGS="$$log_list"; \
1390- exit $$?
1391-test_libupstart.log: test_libupstart$(EXEEXT)
1392- @p='test_libupstart$(EXEEXT)'; \
1393- b='test_libupstart'; \
1394- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1395- --log-file $$b.log --trs-file $$b.trs \
1396- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1397- "$$tst" $(AM_TESTS_FD_REDIRECT)
1398-.test.log:
1399- @p='$<'; \
1400- $(am__set_b); \
1401- $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1402- --log-file $$b.log --trs-file $$b.trs \
1403- $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1404- "$$tst" $(AM_TESTS_FD_REDIRECT)
1405-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
1406-@am__EXEEXT_TRUE@ @p='$<'; \
1407-@am__EXEEXT_TRUE@ $(am__set_b); \
1408-@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1409-@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
1410-@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1411-@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
1412+ if test "$$all" -eq 1; then \
1413+ tests="test"; \
1414+ All=""; \
1415+ else \
1416+ tests="tests"; \
1417+ All="All "; \
1418+ fi; \
1419+ if test "$$failed" -eq 0; then \
1420+ if test "$$xfail" -eq 0; then \
1421+ banner="$$All$$all $$tests passed"; \
1422+ else \
1423+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
1424+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
1425+ fi; \
1426+ else \
1427+ if test "$$xpass" -eq 0; then \
1428+ banner="$$failed of $$all $$tests failed"; \
1429+ else \
1430+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
1431+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
1432+ fi; \
1433+ fi; \
1434+ dashes="$$banner"; \
1435+ skipped=""; \
1436+ if test "$$skip" -ne 0; then \
1437+ if test "$$skip" -eq 1; then \
1438+ skipped="($$skip test was not run)"; \
1439+ else \
1440+ skipped="($$skip tests were not run)"; \
1441+ fi; \
1442+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
1443+ dashes="$$skipped"; \
1444+ fi; \
1445+ report=""; \
1446+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
1447+ report="Please report to $(PACKAGE_BUGREPORT)"; \
1448+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
1449+ dashes="$$report"; \
1450+ fi; \
1451+ dashes=`echo "$$dashes" | sed s/./=/g`; \
1452+ if test "$$failed" -eq 0; then \
1453+ col="$$grn"; \
1454+ else \
1455+ col="$$red"; \
1456+ fi; \
1457+ echo "$${col}$$dashes$${std}"; \
1458+ echo "$${col}$$banner$${std}"; \
1459+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
1460+ test -z "$$report" || echo "$${col}$$report$${std}"; \
1461+ echo "$${col}$$dashes$${std}"; \
1462+ test "$$failed" -eq 0; \
1463+ else :; fi
1464
1465 distdir: $(DISTFILES)
1466 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1467@@ -1163,9 +940,6 @@
1468 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
1469 fi
1470 mostlyclean-generic:
1471- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
1472- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
1473- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1474
1475 clean-generic:
1476 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
1477@@ -1269,9 +1043,9 @@
1478 installdirs maintainer-clean maintainer-clean-generic \
1479 maintainer-clean-local mostlyclean mostlyclean-compile \
1480 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1481- recheck tags tags-am uninstall uninstall-am \
1482- uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1483- uninstall-pkgconfigDATA uninstall-upstartincludeHEADERS
1484+ tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
1485+ uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
1486+ uninstall-upstartincludeHEADERS
1487
1488
1489 upstart/upstart-dbus.h: \
1490
1491=== removed directory 'lib/upstart'
1492=== removed file 'lib/upstart/com.ubuntu.Upstart.Instance.h'
1493--- lib/upstart/com.ubuntu.Upstart.Instance.h 2013-11-15 08:18:37 +0000
1494+++ lib/upstart/com.ubuntu.Upstart.Instance.h 1970-01-01 00:00:00 +0000
1495@@ -1,107 +0,0 @@
1496-/* upstart
1497- *
1498- * Copyright (C) 2010 Scott James Remnant <scott@netsplit.com>.
1499- *
1500- * This file was automatically generated; see the source for copying
1501- * conditions.
1502- */
1503-
1504-#ifndef UPSTART_UPSTART_COM_UBUNTU_UPSTART_INSTANCE_H
1505-#define UPSTART_UPSTART_COM_UBUNTU_UPSTART_INSTANCE_H
1506-
1507-#include <dbus/dbus.h>
1508-
1509-#include <stdint.h>
1510-
1511-#include <nih/macros.h>
1512-
1513-#include <nih-dbus/dbus_interface.h>
1514-#include <nih-dbus/dbus_message.h>
1515-#include <nih-dbus/dbus_pending_data.h>
1516-#include <nih-dbus/dbus_proxy.h>
1517-
1518-
1519-typedef struct job_processes_element {
1520- char * item0;
1521- int32_t item1;
1522-} JobProcessesElement;
1523-
1524-typedef struct job_properties {
1525- char * name;
1526- char * goal;
1527- char * state;
1528- JobProcessesElement **processes;
1529-} JobProperties;
1530-
1531-
1532-typedef void (*JobStartReply) (void *data, NihDBusMessage *message);
1533-
1534-typedef void (*JobStopReply) (void *data, NihDBusMessage *message);
1535-
1536-typedef void (*JobRestartReply) (void *data, NihDBusMessage *message);
1537-
1538-typedef void (*JobReloadReply) (void *data, NihDBusMessage *message);
1539-
1540-typedef void (*JobGoalChangedHandler) (void *data, NihDBusMessage *message, const char *goal);
1541-
1542-typedef void (*JobStateChangedHandler) (void *data, NihDBusMessage *message, const char *state);
1543-
1544-typedef void (*JobFailedHandler) (void *data, NihDBusMessage *message, int32_t status);
1545-
1546-typedef void (*JobGetNameReply) (void *data, NihDBusMessage *message, const char *value);
1547-
1548-typedef void (*JobGetGoalReply) (void *data, NihDBusMessage *message, const char *value);
1549-
1550-typedef void (*JobGetStateReply) (void *data, NihDBusMessage *message, const char *value);
1551-
1552-typedef void (*JobGetProcessesReply) (void *data, NihDBusMessage *message, JobProcessesElement * const *value);
1553-
1554-typedef void (*JobGetAllReply) (void *data, NihDBusMessage *message, const JobProperties *properties);
1555-
1556-
1557-NIH_BEGIN_EXTERN
1558-
1559-extern const NihDBusInterface job_com_ubuntu_Upstart0_6_Instance;
1560-extern const NihDBusInterface *job_interfaces[];
1561-
1562-
1563-DBusPendingCall *job_start (NihDBusProxy *proxy, int wait, JobStartReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1564- __attribute__ ((warn_unused_result));
1565-int job_start_sync (const void *parent, NihDBusProxy *proxy, int wait)
1566- __attribute__ ((warn_unused_result));
1567-DBusPendingCall *job_stop (NihDBusProxy *proxy, int wait, JobStopReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1568- __attribute__ ((warn_unused_result));
1569-int job_stop_sync (const void *parent, NihDBusProxy *proxy, int wait)
1570- __attribute__ ((warn_unused_result));
1571-DBusPendingCall *job_restart (NihDBusProxy *proxy, int wait, JobRestartReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1572- __attribute__ ((warn_unused_result));
1573-int job_restart_sync (const void *parent, NihDBusProxy *proxy, int wait)
1574- __attribute__ ((warn_unused_result));
1575-DBusPendingCall *job_reload (NihDBusProxy *proxy, JobReloadReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1576- __attribute__ ((warn_unused_result));
1577-int job_reload_sync (const void *parent, NihDBusProxy *proxy)
1578- __attribute__ ((warn_unused_result));
1579-DBusPendingCall *job_get_name (NihDBusProxy *proxy, JobGetNameReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1580- __attribute__ ((warn_unused_result));
1581-int job_get_name_sync (const void *parent, NihDBusProxy *proxy, char **value)
1582- __attribute__ ((warn_unused_result));
1583-DBusPendingCall *job_get_goal (NihDBusProxy *proxy, JobGetGoalReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1584- __attribute__ ((warn_unused_result));
1585-int job_get_goal_sync (const void *parent, NihDBusProxy *proxy, char **value)
1586- __attribute__ ((warn_unused_result));
1587-DBusPendingCall *job_get_state (NihDBusProxy *proxy, JobGetStateReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1588- __attribute__ ((warn_unused_result));
1589-int job_get_state_sync (const void *parent, NihDBusProxy *proxy, char **value)
1590- __attribute__ ((warn_unused_result));
1591-DBusPendingCall *job_get_processes (NihDBusProxy *proxy, JobGetProcessesReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1592- __attribute__ ((warn_unused_result));
1593-int job_get_processes_sync (const void *parent, NihDBusProxy *proxy, JobProcessesElement ***value)
1594- __attribute__ ((warn_unused_result));
1595-DBusPendingCall *job_get_all (NihDBusProxy *proxy, JobGetAllReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1596- __attribute__ ((warn_unused_result));
1597-int job_get_all_sync (const void *parent, NihDBusProxy *proxy, JobProperties **properties)
1598- __attribute__ ((warn_unused_result));
1599-
1600-NIH_END_EXTERN
1601-
1602-#endif /* UPSTART_UPSTART_COM_UBUNTU_UPSTART_INSTANCE_H */
1603
1604=== removed file 'lib/upstart/com.ubuntu.Upstart.Job.h'
1605--- lib/upstart/com.ubuntu.Upstart.Job.h 2013-11-15 08:18:37 +0000
1606+++ lib/upstart/com.ubuntu.Upstart.Job.h 1970-01-01 00:00:00 +0000
1607@@ -1,140 +0,0 @@
1608-/* upstart
1609- *
1610- * Copyright (C) 2010 Scott James Remnant <scott@netsplit.com>.
1611- *
1612- * This file was automatically generated; see the source for copying
1613- * conditions.
1614- */
1615-
1616-#ifndef UPSTART_UPSTART_COM_UBUNTU_UPSTART_JOB_H
1617-#define UPSTART_UPSTART_COM_UBUNTU_UPSTART_JOB_H
1618-
1619-#include <dbus/dbus.h>
1620-
1621-#include <stdint.h>
1622-
1623-#include <nih/macros.h>
1624-
1625-#include <nih-dbus/dbus_interface.h>
1626-#include <nih-dbus/dbus_message.h>
1627-#include <nih-dbus/dbus_pending_data.h>
1628-#include <nih-dbus/dbus_proxy.h>
1629-
1630-
1631-typedef struct job_class_properties {
1632- char * name;
1633- char * description;
1634- char * author;
1635- char * version;
1636- char * usage;
1637- char ***start_on;
1638- char ***stop_on;
1639- char ** emits;
1640-} JobClassProperties;
1641-
1642-
1643-typedef void (*JobClassGetInstanceReply) (void *data, NihDBusMessage *message, const char *instance);
1644-
1645-typedef void (*JobClassGetInstanceByNameReply) (void *data, NihDBusMessage *message, const char *instance);
1646-
1647-typedef void (*JobClassGetAllInstancesReply) (void *data, NihDBusMessage *message, char * const *instances);
1648-
1649-typedef void (*JobClassStartReply) (void *data, NihDBusMessage *message, const char *instance);
1650-
1651-typedef void (*JobClassStopReply) (void *data, NihDBusMessage *message);
1652-
1653-typedef void (*JobClassRestartReply) (void *data, NihDBusMessage *message, const char *instance);
1654-
1655-typedef void (*JobClassInstanceAddedHandler) (void *data, NihDBusMessage *message, const char *instance);
1656-
1657-typedef void (*JobClassInstanceRemovedHandler) (void *data, NihDBusMessage *message, const char *instance);
1658-
1659-typedef void (*JobClassGetNameReply) (void *data, NihDBusMessage *message, const char *value);
1660-
1661-typedef void (*JobClassGetDescriptionReply) (void *data, NihDBusMessage *message, const char *value);
1662-
1663-typedef void (*JobClassGetAuthorReply) (void *data, NihDBusMessage *message, const char *value);
1664-
1665-typedef void (*JobClassGetVersionReply) (void *data, NihDBusMessage *message, const char *value);
1666-
1667-typedef void (*JobClassGetUsageReply) (void *data, NihDBusMessage *message, const char *value);
1668-
1669-typedef void (*JobClassGetStartOnReply) (void *data, NihDBusMessage *message, char ** const *value);
1670-
1671-typedef void (*JobClassGetStopOnReply) (void *data, NihDBusMessage *message, char ** const *value);
1672-
1673-typedef void (*JobClassGetEmitsReply) (void *data, NihDBusMessage *message, char * const *value);
1674-
1675-typedef void (*JobClassGetAllReply) (void *data, NihDBusMessage *message, const JobClassProperties *properties);
1676-
1677-
1678-NIH_BEGIN_EXTERN
1679-
1680-extern const NihDBusInterface job_class_com_ubuntu_Upstart0_6_Job;
1681-extern const NihDBusInterface *job_class_interfaces[];
1682-
1683-
1684-DBusPendingCall *job_class_get_instance (NihDBusProxy *proxy, char * const *env, JobClassGetInstanceReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1685- __attribute__ ((warn_unused_result));
1686-int job_class_get_instance_sync (const void *parent, NihDBusProxy *proxy, char * const *env, char **instance)
1687- __attribute__ ((warn_unused_result));
1688-DBusPendingCall *job_class_get_instance_by_name (NihDBusProxy *proxy, const char *name, JobClassGetInstanceByNameReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1689- __attribute__ ((warn_unused_result));
1690-int job_class_get_instance_by_name_sync (const void *parent, NihDBusProxy *proxy, const char *name, char **instance)
1691- __attribute__ ((warn_unused_result));
1692-DBusPendingCall *job_class_get_all_instances (NihDBusProxy *proxy, JobClassGetAllInstancesReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1693- __attribute__ ((warn_unused_result));
1694-int job_class_get_all_instances_sync (const void *parent, NihDBusProxy *proxy, char ***instances)
1695- __attribute__ ((warn_unused_result));
1696-DBusPendingCall *job_class_start (NihDBusProxy *proxy, char * const *env, int wait, JobClassStartReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1697- __attribute__ ((warn_unused_result));
1698-int job_class_start_sync (const void *parent, NihDBusProxy *proxy, char * const *env, int wait, char **instance)
1699- __attribute__ ((warn_unused_result));
1700-DBusPendingCall *job_class_stop (NihDBusProxy *proxy, char * const *env, int wait, JobClassStopReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1701- __attribute__ ((warn_unused_result));
1702-int job_class_stop_sync (const void *parent, NihDBusProxy *proxy, char * const *env, int wait)
1703- __attribute__ ((warn_unused_result));
1704-DBusPendingCall *job_class_restart (NihDBusProxy *proxy, char * const *env, int wait, JobClassRestartReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1705- __attribute__ ((warn_unused_result));
1706-int job_class_restart_sync (const void *parent, NihDBusProxy *proxy, char * const *env, int wait, char **instance)
1707- __attribute__ ((warn_unused_result));
1708-DBusPendingCall *job_class_get_name (NihDBusProxy *proxy, JobClassGetNameReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1709- __attribute__ ((warn_unused_result));
1710-int job_class_get_name_sync (const void *parent, NihDBusProxy *proxy, char **value)
1711- __attribute__ ((warn_unused_result));
1712-DBusPendingCall *job_class_get_description (NihDBusProxy *proxy, JobClassGetDescriptionReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1713- __attribute__ ((warn_unused_result));
1714-int job_class_get_description_sync (const void *parent, NihDBusProxy *proxy, char **value)
1715- __attribute__ ((warn_unused_result));
1716-DBusPendingCall *job_class_get_author (NihDBusProxy *proxy, JobClassGetAuthorReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1717- __attribute__ ((warn_unused_result));
1718-int job_class_get_author_sync (const void *parent, NihDBusProxy *proxy, char **value)
1719- __attribute__ ((warn_unused_result));
1720-DBusPendingCall *job_class_get_version (NihDBusProxy *proxy, JobClassGetVersionReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1721- __attribute__ ((warn_unused_result));
1722-int job_class_get_version_sync (const void *parent, NihDBusProxy *proxy, char **value)
1723- __attribute__ ((warn_unused_result));
1724-DBusPendingCall *job_class_get_usage (NihDBusProxy *proxy, JobClassGetUsageReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1725- __attribute__ ((warn_unused_result));
1726-int job_class_get_usage_sync (const void *parent, NihDBusProxy *proxy, char **value)
1727- __attribute__ ((warn_unused_result));
1728-DBusPendingCall *job_class_get_start_on (NihDBusProxy *proxy, JobClassGetStartOnReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1729- __attribute__ ((warn_unused_result));
1730-int job_class_get_start_on_sync (const void *parent, NihDBusProxy *proxy, char ****value)
1731- __attribute__ ((warn_unused_result));
1732-DBusPendingCall *job_class_get_stop_on (NihDBusProxy *proxy, JobClassGetStopOnReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1733- __attribute__ ((warn_unused_result));
1734-int job_class_get_stop_on_sync (const void *parent, NihDBusProxy *proxy, char ****value)
1735- __attribute__ ((warn_unused_result));
1736-DBusPendingCall *job_class_get_emits (NihDBusProxy *proxy, JobClassGetEmitsReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1737- __attribute__ ((warn_unused_result));
1738-int job_class_get_emits_sync (const void *parent, NihDBusProxy *proxy, char ***value)
1739- __attribute__ ((warn_unused_result));
1740-DBusPendingCall *job_class_get_all (NihDBusProxy *proxy, JobClassGetAllReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1741- __attribute__ ((warn_unused_result));
1742-int job_class_get_all_sync (const void *parent, NihDBusProxy *proxy, JobClassProperties **properties)
1743- __attribute__ ((warn_unused_result));
1744-
1745-NIH_END_EXTERN
1746-
1747-#endif /* UPSTART_UPSTART_COM_UBUNTU_UPSTART_JOB_H */
1748
1749=== removed file 'lib/upstart/com.ubuntu.Upstart.h'
1750--- lib/upstart/com.ubuntu.Upstart.h 2014-07-14 12:42:33 +0000
1751+++ lib/upstart/com.ubuntu.Upstart.h 1970-01-01 00:00:00 +0000
1752@@ -1,180 +0,0 @@
1753-/* upstart
1754- *
1755- * Copyright (C) 2010 Scott James Remnant <scott@netsplit.com>.
1756- *
1757- * This file was automatically generated; see the source for copying
1758- * conditions.
1759- */
1760-
1761-#ifndef UPSTART_UPSTART_COM_UBUNTU_UPSTART_H
1762-#define UPSTART_UPSTART_COM_UBUNTU_UPSTART_H
1763-
1764-#include <dbus/dbus.h>
1765-
1766-#include <stdint.h>
1767-
1768-#include <nih/macros.h>
1769-
1770-#include <nih-dbus/dbus_interface.h>
1771-#include <nih-dbus/dbus_message.h>
1772-#include <nih-dbus/dbus_pending_data.h>
1773-#include <nih-dbus/dbus_proxy.h>
1774-
1775-
1776-typedef struct upstart_properties {
1777- char *version;
1778- char *log_priority;
1779-} UpstartProperties;
1780-
1781-
1782-typedef void (*UpstartReloadConfigurationReply) (void *data, NihDBusMessage *message);
1783-
1784-typedef void (*UpstartGetJobByNameReply) (void *data, NihDBusMessage *message, const char *job);
1785-
1786-typedef void (*UpstartGetAllJobsReply) (void *data, NihDBusMessage *message, char * const *jobs);
1787-
1788-typedef void (*UpstartGetStateReply) (void *data, NihDBusMessage *message, const char *state);
1789-
1790-typedef void (*UpstartRestartReply) (void *data, NihDBusMessage *message);
1791-
1792-typedef void (*UpstartGetEnvReply) (void *data, NihDBusMessage *message, const char *value);
1793-
1794-typedef void (*UpstartSetEnvReply) (void *data, NihDBusMessage *message);
1795-
1796-typedef void (*UpstartSetEnvListReply) (void *data, NihDBusMessage *message);
1797-
1798-typedef void (*UpstartUnsetEnvReply) (void *data, NihDBusMessage *message);
1799-
1800-typedef void (*UpstartUnsetEnvListReply) (void *data, NihDBusMessage *message);
1801-
1802-typedef void (*UpstartListEnvReply) (void *data, NihDBusMessage *message, char * const *env);
1803-
1804-typedef void (*UpstartResetEnvReply) (void *data, NihDBusMessage *message);
1805-
1806-typedef void (*UpstartEmitEventReply) (void *data, NihDBusMessage *message);
1807-
1808-typedef void (*UpstartEmitEventWithFileReply) (void *data, NihDBusMessage *message);
1809-
1810-typedef void (*UpstartNotifyDiskWriteableReply) (void *data, NihDBusMessage *message);
1811-
1812-typedef void (*UpstartNotifyDbusAddressReply) (void *data, NihDBusMessage *message);
1813-
1814-typedef void (*UpstartNotifyCgroupManagerAddressReply) (void *data, NihDBusMessage *message);
1815-
1816-typedef void (*UpstartEndSessionReply) (void *data, NihDBusMessage *message);
1817-
1818-typedef void (*UpstartJobAddedHandler) (void *data, NihDBusMessage *message, const char *job);
1819-
1820-typedef void (*UpstartJobRemovedHandler) (void *data, NihDBusMessage *message, const char *job);
1821-
1822-typedef void (*UpstartEventEmittedHandler) (void *data, NihDBusMessage *message, const char *name, char * const *env);
1823-
1824-typedef void (*UpstartRestartedHandler) (void *data, NihDBusMessage *message);
1825-
1826-typedef void (*UpstartGetVersionReply) (void *data, NihDBusMessage *message, const char *value);
1827-
1828-typedef void (*UpstartGetLogPriorityReply) (void *data, NihDBusMessage *message, const char *value);
1829-
1830-typedef void (*UpstartSetLogPriorityReply) (void *data, NihDBusMessage *message);
1831-
1832-typedef void (*UpstartGetAllReply) (void *data, NihDBusMessage *message, const UpstartProperties *properties);
1833-
1834-
1835-NIH_BEGIN_EXTERN
1836-
1837-extern const NihDBusInterface upstart_com_ubuntu_Upstart0_6;
1838-extern const NihDBusInterface *upstart_interfaces[];
1839-
1840-
1841-DBusPendingCall *upstart_reload_configuration (NihDBusProxy *proxy, UpstartReloadConfigurationReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1842- __attribute__ ((warn_unused_result));
1843-int upstart_reload_configuration_sync (const void *parent, NihDBusProxy *proxy)
1844- __attribute__ ((warn_unused_result));
1845-DBusPendingCall *upstart_get_job_by_name (NihDBusProxy *proxy, const char *name, UpstartGetJobByNameReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1846- __attribute__ ((warn_unused_result));
1847-int upstart_get_job_by_name_sync (const void *parent, NihDBusProxy *proxy, const char *name, char **job)
1848- __attribute__ ((warn_unused_result));
1849-DBusPendingCall *upstart_get_all_jobs (NihDBusProxy *proxy, UpstartGetAllJobsReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1850- __attribute__ ((warn_unused_result));
1851-int upstart_get_all_jobs_sync (const void *parent, NihDBusProxy *proxy, char ***jobs)
1852- __attribute__ ((warn_unused_result));
1853-DBusPendingCall *upstart_get_state (NihDBusProxy *proxy, UpstartGetStateReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1854- __attribute__ ((warn_unused_result));
1855-int upstart_get_state_sync (const void *parent, NihDBusProxy *proxy, char **state)
1856- __attribute__ ((warn_unused_result));
1857-DBusPendingCall *upstart_restart (NihDBusProxy *proxy, UpstartRestartReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1858- __attribute__ ((warn_unused_result));
1859-int upstart_restart_sync (const void *parent, NihDBusProxy *proxy)
1860- __attribute__ ((warn_unused_result));
1861-DBusPendingCall *upstart_get_env (NihDBusProxy *proxy, char * const *job_details, const char *name, UpstartGetEnvReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1862- __attribute__ ((warn_unused_result));
1863-int upstart_get_env_sync (const void *parent, NihDBusProxy *proxy, char * const *job_details, const char *name, char **value)
1864- __attribute__ ((warn_unused_result));
1865-DBusPendingCall *upstart_set_env (NihDBusProxy *proxy, char * const *job_details, const char *var, int replace, UpstartSetEnvReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1866- __attribute__ ((warn_unused_result));
1867-int upstart_set_env_sync (const void *parent, NihDBusProxy *proxy, char * const *job_details, const char *var, int replace)
1868- __attribute__ ((warn_unused_result));
1869-DBusPendingCall *upstart_set_env_list (NihDBusProxy *proxy, char * const *job_details, char * const *vars, int replace, UpstartSetEnvListReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1870- __attribute__ ((warn_unused_result));
1871-int upstart_set_env_list_sync (const void *parent, NihDBusProxy *proxy, char * const *job_details, char * const *vars, int replace)
1872- __attribute__ ((warn_unused_result));
1873-DBusPendingCall *upstart_unset_env (NihDBusProxy *proxy, char * const *job_details, const char *name, UpstartUnsetEnvReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1874- __attribute__ ((warn_unused_result));
1875-int upstart_unset_env_sync (const void *parent, NihDBusProxy *proxy, char * const *job_details, const char *name)
1876- __attribute__ ((warn_unused_result));
1877-DBusPendingCall *upstart_unset_env_list (NihDBusProxy *proxy, char * const *job_details, char * const *name, UpstartUnsetEnvListReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1878- __attribute__ ((warn_unused_result));
1879-int upstart_unset_env_list_sync (const void *parent, NihDBusProxy *proxy, char * const *job_details, char * const *name)
1880- __attribute__ ((warn_unused_result));
1881-DBusPendingCall *upstart_list_env (NihDBusProxy *proxy, char * const *job_details, UpstartListEnvReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1882- __attribute__ ((warn_unused_result));
1883-int upstart_list_env_sync (const void *parent, NihDBusProxy *proxy, char * const *job_details, char ***env)
1884- __attribute__ ((warn_unused_result));
1885-DBusPendingCall *upstart_reset_env (NihDBusProxy *proxy, char * const *job_details, UpstartResetEnvReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1886- __attribute__ ((warn_unused_result));
1887-int upstart_reset_env_sync (const void *parent, NihDBusProxy *proxy, char * const *job_details)
1888- __attribute__ ((warn_unused_result));
1889-DBusPendingCall *upstart_emit_event (NihDBusProxy *proxy, const char *name, char * const *env, int wait, UpstartEmitEventReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1890- __attribute__ ((warn_unused_result));
1891-int upstart_emit_event_sync (const void *parent, NihDBusProxy *proxy, const char *name, char * const *env, int wait)
1892- __attribute__ ((warn_unused_result));
1893-DBusPendingCall *upstart_emit_event_with_file (NihDBusProxy *proxy, const char *name, char * const *env, int wait, int file, UpstartEmitEventWithFileReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1894- __attribute__ ((warn_unused_result));
1895-int upstart_emit_event_with_file_sync (const void *parent, NihDBusProxy *proxy, const char *name, char * const *env, int wait, int file)
1896- __attribute__ ((warn_unused_result));
1897-DBusPendingCall *upstart_notify_disk_writeable (NihDBusProxy *proxy, UpstartNotifyDiskWriteableReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1898- __attribute__ ((warn_unused_result));
1899-int upstart_notify_disk_writeable_sync (const void *parent, NihDBusProxy *proxy)
1900- __attribute__ ((warn_unused_result));
1901-DBusPendingCall *upstart_notify_dbus_address (NihDBusProxy *proxy, const char *address, UpstartNotifyDbusAddressReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1902- __attribute__ ((warn_unused_result));
1903-int upstart_notify_dbus_address_sync (const void *parent, NihDBusProxy *proxy, const char *address)
1904- __attribute__ ((warn_unused_result));
1905-DBusPendingCall *upstart_notify_cgroup_manager_address (NihDBusProxy *proxy, const char *address, UpstartNotifyCgroupManagerAddressReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1906- __attribute__ ((warn_unused_result));
1907-int upstart_notify_cgroup_manager_address_sync (const void *parent, NihDBusProxy *proxy, const char *address)
1908- __attribute__ ((warn_unused_result));
1909-DBusPendingCall *upstart_end_session (NihDBusProxy *proxy, UpstartEndSessionReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1910- __attribute__ ((warn_unused_result));
1911-int upstart_end_session_sync (const void *parent, NihDBusProxy *proxy)
1912- __attribute__ ((warn_unused_result));
1913-DBusPendingCall *upstart_get_version (NihDBusProxy *proxy, UpstartGetVersionReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1914- __attribute__ ((warn_unused_result));
1915-int upstart_get_version_sync (const void *parent, NihDBusProxy *proxy, char **value)
1916- __attribute__ ((warn_unused_result));
1917-DBusPendingCall *upstart_get_log_priority (NihDBusProxy *proxy, UpstartGetLogPriorityReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1918- __attribute__ ((warn_unused_result));
1919-int upstart_get_log_priority_sync (const void *parent, NihDBusProxy *proxy, char **value)
1920- __attribute__ ((warn_unused_result));
1921-DBusPendingCall *upstart_set_log_priority (NihDBusProxy *proxy, const char *value, UpstartSetLogPriorityReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1922- __attribute__ ((warn_unused_result));
1923-int upstart_set_log_priority_sync (const void *parent, NihDBusProxy *proxy, const char *value)
1924- __attribute__ ((warn_unused_result));
1925-DBusPendingCall *upstart_get_all (NihDBusProxy *proxy, UpstartGetAllReply handler, NihDBusErrorHandler error_handler, void *data, int timeout)
1926- __attribute__ ((warn_unused_result));
1927-int upstart_get_all_sync (const void *parent, NihDBusProxy *proxy, UpstartProperties **properties)
1928- __attribute__ ((warn_unused_result));
1929-
1930-NIH_END_EXTERN
1931-
1932-#endif /* UPSTART_UPSTART_COM_UBUNTU_UPSTART_H */
1933
1934=== removed file 'lib/upstart/upstart-dbus.h'
1935--- lib/upstart/upstart-dbus.h 2013-11-15 08:18:37 +0000
1936+++ lib/upstart/upstart-dbus.h 1970-01-01 00:00:00 +0000
1937@@ -1,84 +0,0 @@
1938-/* upstart
1939- *
1940- * Copyright © 2010 Canonical Ltd.
1941- * Author: Scott James Remnant <scott@netsplit.com>.
1942- *
1943- * This program is free software; you can redistribute it and/or modify
1944- * it under the terms of the GNU General Public License version 2, as
1945- * published by the Free Software Foundation.
1946- *
1947- * This program is distributed in the hope that it will be useful,
1948- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1949- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1950- * GNU General Public License for more details.
1951- *
1952- * You should have received a copy of the GNU General Public License along
1953- * with this program; if not, write to the Free Software Foundation, Inc.,
1954- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1955- */
1956-
1957-#ifndef DBUS_UPSTART_H
1958-#define DBUS_UPSTART_H
1959-
1960-
1961-/**
1962- * DBUS_SERVICE_UPSTART:
1963- *
1964- * The well-known name used by Upstart on the system bus.
1965- **/
1966-#ifndef DBUS_SERVICE_UPSTART
1967-# ifdef DEBUG
1968-# define DBUS_SERVICE_UPSTART "com.ubuntu.TestUpstart"
1969-# else
1970-# define DBUS_SERVICE_UPSTART "com.ubuntu.Upstart"
1971-# endif
1972-#endif
1973-
1974-
1975-/**
1976- * DBUS_PATH_UPSTART:
1977- *
1978- * The object path used by the manager object, and used as the root path
1979- * for all other objects.
1980- **/
1981-#define DBUS_PATH_UPSTART "/com/ubuntu/Upstart"
1982-
1983-
1984-/**
1985- * DBUS_INTERFACE_UPSTART:
1986- *
1987- * The interface exported by the manager object.
1988- **/
1989-#define DBUS_INTERFACE_UPSTART "com.ubuntu.Upstart0_6"
1990-
1991-/**
1992- * DBUS_INTERFACE_UPSTART_JOB:
1993- *
1994- * The interface exported by job objects.
1995- **/
1996-#define DBUS_INTERFACE_UPSTART_JOB "com.ubuntu.Upstart0_6.Job"
1997-
1998-/**
1999- * DBUS_INTERFACE_UPSTART_INSTANCE:
2000- *
2001- * The interface exported by instance objects.
2002- **/
2003-#define DBUS_INTERFACE_UPSTART_INSTANCE "com.ubuntu.Upstart0_6.Instance"
2004-
2005-
2006-/**
2007- * DBUS_ADDRESS_UPSTART:
2008- *
2009- * The address where the private D-Bus server inside Upstart can be
2010- * found.
2011- **/
2012-#ifndef DBUS_ADDRESS_UPSTART
2013-# ifdef DEBUG
2014-# define DBUS_ADDRESS_UPSTART "unix:abstract=/com/ubuntu/test_upstart"
2015-# else
2016-# define DBUS_ADDRESS_UPSTART "unix:abstract=/com/ubuntu/upstart"
2017-# endif
2018-#endif
2019-
2020-
2021-#endif /* DBUS_UPSTART_H */
2022
2023=== modified file 'ltmain.sh'
2024--- ltmain.sh 2014-03-11 15:23:07 +0000
2025+++ ltmain.sh 2014-08-27 23:03:20 +0000
2026@@ -70,7 +70,7 @@
2027 # compiler: $LTCC
2028 # compiler flags: $LTCFLAGS
2029 # linker: $LD (gnu? $with_gnu_ld)
2030-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
2031+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.10ubuntu1
2032 # automake: $automake_version
2033 # autoconf: $autoconf_version
2034 #
2035@@ -80,7 +80,7 @@
2036
2037 PROGRAM=libtool
2038 PACKAGE=libtool
2039-VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
2040+VERSION="2.4.2 Debian-2.4.2-1.10ubuntu1"
2041 TIMESTAMP=""
2042 package_revision=1.3337
2043
2044
2045=== modified file 'scripts/Makefile.in'
2046--- scripts/Makefile.in 2014-07-14 12:48:09 +0000
2047+++ scripts/Makefile.in 2014-08-27 23:03:20 +0000
2048@@ -302,6 +302,8 @@
2049 POSUB = @POSUB@
2050 RANLIB = @RANLIB@
2051 SED = @SED@
2052+SELINUX_CFLAGS = @SELINUX_CFLAGS@
2053+SELINUX_LIBS = @SELINUX_LIBS@
2054 SET_MAKE = @SET_MAKE@
2055 SHELL = @SHELL@
2056 STRIP = @STRIP@
2057
2058=== modified file 'scripts/data/Makefile.in'
2059--- scripts/data/Makefile.in 2014-07-14 12:48:09 +0000
2060+++ scripts/data/Makefile.in 2014-08-27 23:03:20 +0000
2061@@ -238,6 +238,8 @@
2062 POSUB = @POSUB@
2063 RANLIB = @RANLIB@
2064 SED = @SED@
2065+SELINUX_CFLAGS = @SELINUX_CFLAGS@
2066+SELINUX_LIBS = @SELINUX_LIBS@
2067 SET_MAKE = @SET_MAKE@
2068 SHELL = @SHELL@
2069 STRIP = @STRIP@
2070
2071=== modified file 'test/Makefile.in'
2072--- test/Makefile.in 2014-07-14 12:48:09 +0000
2073+++ test/Makefile.in 2014-08-27 23:03:20 +0000
2074@@ -82,7 +82,7 @@
2075 @ENABLE_CGROUPS_TRUE@am__append_1 = $(CGMANAGER_LIBS)
2076 subdir = test
2077 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
2078- $(top_srcdir)/depcomp $(top_srcdir)/test-driver
2079+ $(top_srcdir)/depcomp
2080 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
2081 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
2082 $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
2083@@ -204,187 +204,6 @@
2084 std=''; \
2085 fi; \
2086 }
2087-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
2088-am__vpath_adj = case $$p in \
2089- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
2090- *) f=$$p;; \
2091- esac;
2092-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
2093-am__install_max = 40
2094-am__nobase_strip_setup = \
2095- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
2096-am__nobase_strip = \
2097- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
2098-am__nobase_list = $(am__nobase_strip_setup); \
2099- for p in $$list; do echo "$$p $$p"; done | \
2100- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
2101- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
2102- if (++n[$$2] == $(am__install_max)) \
2103- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
2104- END { for (dir in files) print dir, files[dir] }'
2105-am__base_list = \
2106- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2107- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2108-am__uninstall_files_from_dir = { \
2109- test -z "$$files" \
2110- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
2111- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
2112- $(am__cd) "$$dir" && rm -f $$files; }; \
2113- }
2114-am__recheck_rx = ^[ ]*:recheck:[ ]*
2115-am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
2116-am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
2117-# A command that, given a newline-separated list of test names on the
2118-# standard input, print the name of the tests that are to be re-run
2119-# upon "make recheck".
2120-am__list_recheck_tests = $(AWK) '{ \
2121- recheck = 1; \
2122- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
2123- { \
2124- if (rc < 0) \
2125- { \
2126- if ((getline line2 < ($$0 ".log")) < 0) \
2127- recheck = 0; \
2128- break; \
2129- } \
2130- else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
2131- { \
2132- recheck = 0; \
2133- break; \
2134- } \
2135- else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
2136- { \
2137- break; \
2138- } \
2139- }; \
2140- if (recheck) \
2141- print $$0; \
2142- close ($$0 ".trs"); \
2143- close ($$0 ".log"); \
2144-}'
2145-# A command that, given a newline-separated list of test names on the
2146-# standard input, create the global log from their .trs and .log files.
2147-am__create_global_log = $(AWK) ' \
2148-function fatal(msg) \
2149-{ \
2150- print "fatal: making $@: " msg | "cat >&2"; \
2151- exit 1; \
2152-} \
2153-function rst_section(header) \
2154-{ \
2155- print header; \
2156- len = length(header); \
2157- for (i = 1; i <= len; i = i + 1) \
2158- printf "="; \
2159- printf "\n\n"; \
2160-} \
2161-{ \
2162- copy_in_global_log = 1; \
2163- global_test_result = "RUN"; \
2164- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
2165- { \
2166- if (rc < 0) \
2167- fatal("failed to read from " $$0 ".trs"); \
2168- if (line ~ /$(am__global_test_result_rx)/) \
2169- { \
2170- sub("$(am__global_test_result_rx)", "", line); \
2171- sub("[ ]*$$", "", line); \
2172- global_test_result = line; \
2173- } \
2174- else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
2175- copy_in_global_log = 0; \
2176- }; \
2177- if (copy_in_global_log) \
2178- { \
2179- rst_section(global_test_result ": " $$0); \
2180- while ((rc = (getline line < ($$0 ".log"))) != 0) \
2181- { \
2182- if (rc < 0) \
2183- fatal("failed to read from " $$0 ".log"); \
2184- print line; \
2185- }; \
2186- printf "\n"; \
2187- }; \
2188- close ($$0 ".trs"); \
2189- close ($$0 ".log"); \
2190-}'
2191-# Restructured Text title.
2192-am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
2193-# Solaris 10 'make', and several other traditional 'make' implementations,
2194-# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
2195-# by disabling -e (using the XSI extension "set +e") if it's set.
2196-am__sh_e_setup = case $$- in *e*) set +e;; esac
2197-# Default flags passed to test drivers.
2198-am__common_driver_flags = \
2199- --color-tests "$$am__color_tests" \
2200- --enable-hard-errors "$$am__enable_hard_errors" \
2201- --expect-failure "$$am__expect_failure"
2202-# To be inserted before the command running the test. Creates the
2203-# directory for the log if needed. Stores in $dir the directory
2204-# containing $f, in $tst the test, in $log the log. Executes the
2205-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
2206-# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
2207-# will run the test scripts (or their associated LOG_COMPILER, if
2208-# thy have one).
2209-am__check_pre = \
2210-$(am__sh_e_setup); \
2211-$(am__vpath_adj_setup) $(am__vpath_adj) \
2212-$(am__tty_colors); \
2213-srcdir=$(srcdir); export srcdir; \
2214-case "$@" in \
2215- */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
2216- *) am__odir=.;; \
2217-esac; \
2218-test "x$$am__odir" = x"." || test -d "$$am__odir" \
2219- || $(MKDIR_P) "$$am__odir" || exit $$?; \
2220-if test -f "./$$f"; then dir=./; \
2221-elif test -f "$$f"; then dir=; \
2222-else dir="$(srcdir)/"; fi; \
2223-tst=$$dir$$f; log='$@'; \
2224-if test -n '$(DISABLE_HARD_ERRORS)'; then \
2225- am__enable_hard_errors=no; \
2226-else \
2227- am__enable_hard_errors=yes; \
2228-fi; \
2229-case " $(XFAIL_TESTS) " in \
2230- *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
2231- am__expect_failure=yes;; \
2232- *) \
2233- am__expect_failure=no;; \
2234-esac; \
2235-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
2236-# A shell command to get the names of the tests scripts with any registered
2237-# extension removed (i.e., equivalently, the names of the test logs, with
2238-# the '.log' extension removed). The result is saved in the shell variable
2239-# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
2240-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
2241-# since that might cause problem with VPATH rewrites for suffix-less tests.
2242-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
2243-am__set_TESTS_bases = \
2244- bases='$(TEST_LOGS)'; \
2245- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
2246- bases=`echo $$bases`
2247-RECHECK_LOGS = $(TEST_LOGS)
2248-AM_RECURSIVE_TARGETS = check recheck
2249-TEST_SUITE_LOG = test-suite.log
2250-TEST_EXTENSIONS = @EXEEXT@ .test
2251-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
2252-am__set_b = \
2253- case '$@' in \
2254- */*) \
2255- case '$*' in \
2256- */*) b='$*';; \
2257- *) b=`echo '$@' | sed 's/\.log$$//'`; \
2258- esac;; \
2259- *) \
2260- b='$*';; \
2261- esac
2262-am__test_logs1 = $(TESTS:=.log)
2263-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
2264-TEST_LOGS = $(am__test_logs2:.test.log=.log)
2265-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
2266-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
2267- $(TEST_LOG_FLAGS)
2268 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2269 ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@
2270 ACLOCAL = @ACLOCAL@
2271@@ -478,6 +297,8 @@
2272 POSUB = @POSUB@
2273 RANLIB = @RANLIB@
2274 SED = @SED@
2275+SELINUX_CFLAGS = @SELINUX_CFLAGS@
2276+SELINUX_LIBS = @SELINUX_LIBS@
2277 SET_MAKE = @SET_MAKE@
2278 SHELL = @SHELL@
2279 STRIP = @STRIP@
2280@@ -569,7 +390,7 @@
2281 all: all-am
2282
2283 .SUFFIXES:
2284-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
2285+.SUFFIXES: .c .lo .o .obj
2286 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
2287 @for dep in $?; do \
2288 case '$(am__configure_deps)' in \
2289@@ -724,168 +545,98 @@
2290 distclean-tags:
2291 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
2292
2293-# Recover from deleted '.trs' file; this should ensure that
2294-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
2295-# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
2296-# to avoid problems with "make -n".
2297-.log.trs:
2298- rm -f $< $@
2299- $(MAKE) $(AM_MAKEFLAGS) $<
2300-
2301-# Leading 'am--fnord' is there to ensure the list of targets does not
2302-# expand to empty, as could happen e.g. with make check TESTS=''.
2303-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
2304-am--force-recheck:
2305- @:
2306-
2307-$(TEST_SUITE_LOG): $(TEST_LOGS)
2308- @$(am__set_TESTS_bases); \
2309- am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
2310- redo_bases=`for i in $$bases; do \
2311- am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
2312- done`; \
2313- if test -n "$$redo_bases"; then \
2314- redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
2315- redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
2316- if $(am__make_dryrun); then :; else \
2317- rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
2318- fi; \
2319- fi; \
2320- if test -n "$$am__remaking_logs"; then \
2321- echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
2322- "recursion detected" >&2; \
2323- else \
2324- am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
2325- fi; \
2326- if $(am__make_dryrun); then :; else \
2327- st=0; \
2328- errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
2329- for i in $$redo_bases; do \
2330- test -f $$i.trs && test -r $$i.trs \
2331- || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
2332- test -f $$i.log && test -r $$i.log \
2333- || { echo "$$errmsg $$i.log" >&2; st=1; }; \
2334+check-TESTS: $(TESTS)
2335+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
2336+ srcdir=$(srcdir); export srcdir; \
2337+ list=' $(TESTS) '; \
2338+ $(am__tty_colors); \
2339+ if test -n "$$list"; then \
2340+ for tst in $$list; do \
2341+ if test -f ./$$tst; then dir=./; \
2342+ elif test -f $$tst; then dir=; \
2343+ else dir="$(srcdir)/"; fi; \
2344+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
2345+ all=`expr $$all + 1`; \
2346+ case " $(XFAIL_TESTS) " in \
2347+ *[\ \ ]$$tst[\ \ ]*) \
2348+ xpass=`expr $$xpass + 1`; \
2349+ failed=`expr $$failed + 1`; \
2350+ col=$$red; res=XPASS; \
2351+ ;; \
2352+ *) \
2353+ col=$$grn; res=PASS; \
2354+ ;; \
2355+ esac; \
2356+ elif test $$? -ne 77; then \
2357+ all=`expr $$all + 1`; \
2358+ case " $(XFAIL_TESTS) " in \
2359+ *[\ \ ]$$tst[\ \ ]*) \
2360+ xfail=`expr $$xfail + 1`; \
2361+ col=$$lgn; res=XFAIL; \
2362+ ;; \
2363+ *) \
2364+ failed=`expr $$failed + 1`; \
2365+ col=$$red; res=FAIL; \
2366+ ;; \
2367+ esac; \
2368+ else \
2369+ skip=`expr $$skip + 1`; \
2370+ col=$$blu; res=SKIP; \
2371+ fi; \
2372+ echo "$${col}$$res$${std}: $$tst"; \
2373 done; \
2374- test $$st -eq 0 || exit 1; \
2375- fi
2376- @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
2377- ws='[ ]'; \
2378- results=`for b in $$bases; do echo $$b.trs; done`; \
2379- test -n "$$results" || results=/dev/null; \
2380- all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
2381- pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
2382- fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
2383- skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
2384- xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
2385- xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
2386- error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
2387- if test `expr $$fail + $$xpass + $$error` -eq 0; then \
2388- success=true; \
2389- else \
2390- success=false; \
2391- fi; \
2392- br='==================='; br=$$br$$br$$br$$br; \
2393- result_count () \
2394- { \
2395- if test x"$$1" = x"--maybe-color"; then \
2396- maybe_colorize=yes; \
2397- elif test x"$$1" = x"--no-color"; then \
2398- maybe_colorize=no; \
2399- else \
2400- echo "$@: invalid 'result_count' usage" >&2; exit 4; \
2401- fi; \
2402- shift; \
2403- desc=$$1 count=$$2; \
2404- if test $$maybe_colorize = yes && test $$count -gt 0; then \
2405- color_start=$$3 color_end=$$std; \
2406- else \
2407- color_start= color_end=; \
2408- fi; \
2409- echo "$${color_start}# $$desc $$count$${color_end}"; \
2410- }; \
2411- create_testsuite_report () \
2412- { \
2413- result_count $$1 "TOTAL:" $$all "$$brg"; \
2414- result_count $$1 "PASS: " $$pass "$$grn"; \
2415- result_count $$1 "SKIP: " $$skip "$$blu"; \
2416- result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
2417- result_count $$1 "FAIL: " $$fail "$$red"; \
2418- result_count $$1 "XPASS:" $$xpass "$$red"; \
2419- result_count $$1 "ERROR:" $$error "$$mgn"; \
2420- }; \
2421- { \
2422- echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
2423- $(am__rst_title); \
2424- create_testsuite_report --no-color; \
2425- echo; \
2426- echo ".. contents:: :depth: 2"; \
2427- echo; \
2428- for b in $$bases; do echo $$b; done \
2429- | $(am__create_global_log); \
2430- } >$(TEST_SUITE_LOG).tmp || exit 1; \
2431- mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
2432- if $$success; then \
2433- col="$$grn"; \
2434- else \
2435- col="$$red"; \
2436- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
2437- fi; \
2438- echo "$${col}$$br$${std}"; \
2439- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
2440- echo "$${col}$$br$${std}"; \
2441- create_testsuite_report --maybe-color; \
2442- echo "$$col$$br$$std"; \
2443- if $$success; then :; else \
2444- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
2445- if test -n "$(PACKAGE_BUGREPORT)"; then \
2446- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
2447- fi; \
2448- echo "$$col$$br$$std"; \
2449- fi; \
2450- $$success || exit 1
2451-
2452-check-TESTS:
2453- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
2454- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
2455- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2456- @set +e; $(am__set_TESTS_bases); \
2457- log_list=`for i in $$bases; do echo $$i.log; done`; \
2458- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
2459- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
2460- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
2461- exit $$?;
2462-recheck: all $(check_LIBRARIES) $(check_PROGRAMS)
2463- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2464- @set +e; $(am__set_TESTS_bases); \
2465- bases=`for i in $$bases; do echo $$i; done \
2466- | $(am__list_recheck_tests)` || exit 1; \
2467- log_list=`for i in $$bases; do echo $$i.log; done`; \
2468- log_list=`echo $$log_list`; \
2469- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
2470- am__force_recheck=am--force-recheck \
2471- TEST_LOGS="$$log_list"; \
2472- exit $$?
2473-test_util_check_env.log: test_util_check_env$(EXEEXT)
2474- @p='test_util_check_env$(EXEEXT)'; \
2475- b='test_util_check_env'; \
2476- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2477- --log-file $$b.log --trs-file $$b.trs \
2478- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2479- "$$tst" $(AM_TESTS_FD_REDIRECT)
2480-.test.log:
2481- @p='$<'; \
2482- $(am__set_b); \
2483- $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
2484- --log-file $$b.log --trs-file $$b.trs \
2485- $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
2486- "$$tst" $(AM_TESTS_FD_REDIRECT)
2487-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
2488-@am__EXEEXT_TRUE@ @p='$<'; \
2489-@am__EXEEXT_TRUE@ $(am__set_b); \
2490-@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
2491-@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
2492-@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
2493-@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
2494+ if test "$$all" -eq 1; then \
2495+ tests="test"; \
2496+ All=""; \
2497+ else \
2498+ tests="tests"; \
2499+ All="All "; \
2500+ fi; \
2501+ if test "$$failed" -eq 0; then \
2502+ if test "$$xfail" -eq 0; then \
2503+ banner="$$All$$all $$tests passed"; \
2504+ else \
2505+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
2506+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
2507+ fi; \
2508+ else \
2509+ if test "$$xpass" -eq 0; then \
2510+ banner="$$failed of $$all $$tests failed"; \
2511+ else \
2512+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
2513+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
2514+ fi; \
2515+ fi; \
2516+ dashes="$$banner"; \
2517+ skipped=""; \
2518+ if test "$$skip" -ne 0; then \
2519+ if test "$$skip" -eq 1; then \
2520+ skipped="($$skip test was not run)"; \
2521+ else \
2522+ skipped="($$skip tests were not run)"; \
2523+ fi; \
2524+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
2525+ dashes="$$skipped"; \
2526+ fi; \
2527+ report=""; \
2528+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
2529+ report="Please report to $(PACKAGE_BUGREPORT)"; \
2530+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
2531+ dashes="$$report"; \
2532+ fi; \
2533+ dashes=`echo "$$dashes" | sed s/./=/g`; \
2534+ if test "$$failed" -eq 0; then \
2535+ col="$$grn"; \
2536+ else \
2537+ col="$$red"; \
2538+ fi; \
2539+ echo "$${col}$$dashes$${std}"; \
2540+ echo "$${col}$$banner$${std}"; \
2541+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
2542+ test -z "$$report" || echo "$${col}$$report$${std}"; \
2543+ echo "$${col}$$dashes$${std}"; \
2544+ test "$$failed" -eq 0; \
2545+ else :; fi
2546
2547 distdir: $(DISTFILES)
2548 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
2549@@ -943,9 +694,6 @@
2550 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
2551 fi
2552 mostlyclean-generic:
2553- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
2554- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
2555- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2556
2557 clean-generic:
2558
2559@@ -1041,8 +789,7 @@
2560 install-strip installcheck installcheck-am installdirs \
2561 maintainer-clean maintainer-clean-generic mostlyclean \
2562 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
2563- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
2564- uninstall-am
2565+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
2566
2567
2568 .PHONY: tests
2569
2570=== modified file 'util/Makefile.in'
2571--- util/Makefile.in 2014-07-14 12:48:09 +0000
2572+++ util/Makefile.in 2014-08-27 23:03:20 +0000
2573@@ -86,8 +86,7 @@
2574 @ENABLE_CGROUPS_TRUE@am__append_1 = $(CGMANAGER_LIBS)
2575 subdir = util
2576 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
2577- $(top_srcdir)/depcomp $(dist_man_MANS) \
2578- $(top_srcdir)/test-driver
2579+ $(top_srcdir)/depcomp $(dist_man_MANS)
2580 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
2581 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
2582 $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
2583@@ -292,160 +291,6 @@
2584 std=''; \
2585 fi; \
2586 }
2587-am__recheck_rx = ^[ ]*:recheck:[ ]*
2588-am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
2589-am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
2590-# A command that, given a newline-separated list of test names on the
2591-# standard input, print the name of the tests that are to be re-run
2592-# upon "make recheck".
2593-am__list_recheck_tests = $(AWK) '{ \
2594- recheck = 1; \
2595- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
2596- { \
2597- if (rc < 0) \
2598- { \
2599- if ((getline line2 < ($$0 ".log")) < 0) \
2600- recheck = 0; \
2601- break; \
2602- } \
2603- else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
2604- { \
2605- recheck = 0; \
2606- break; \
2607- } \
2608- else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
2609- { \
2610- break; \
2611- } \
2612- }; \
2613- if (recheck) \
2614- print $$0; \
2615- close ($$0 ".trs"); \
2616- close ($$0 ".log"); \
2617-}'
2618-# A command that, given a newline-separated list of test names on the
2619-# standard input, create the global log from their .trs and .log files.
2620-am__create_global_log = $(AWK) ' \
2621-function fatal(msg) \
2622-{ \
2623- print "fatal: making $@: " msg | "cat >&2"; \
2624- exit 1; \
2625-} \
2626-function rst_section(header) \
2627-{ \
2628- print header; \
2629- len = length(header); \
2630- for (i = 1; i <= len; i = i + 1) \
2631- printf "="; \
2632- printf "\n\n"; \
2633-} \
2634-{ \
2635- copy_in_global_log = 1; \
2636- global_test_result = "RUN"; \
2637- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
2638- { \
2639- if (rc < 0) \
2640- fatal("failed to read from " $$0 ".trs"); \
2641- if (line ~ /$(am__global_test_result_rx)/) \
2642- { \
2643- sub("$(am__global_test_result_rx)", "", line); \
2644- sub("[ ]*$$", "", line); \
2645- global_test_result = line; \
2646- } \
2647- else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
2648- copy_in_global_log = 0; \
2649- }; \
2650- if (copy_in_global_log) \
2651- { \
2652- rst_section(global_test_result ": " $$0); \
2653- while ((rc = (getline line < ($$0 ".log"))) != 0) \
2654- { \
2655- if (rc < 0) \
2656- fatal("failed to read from " $$0 ".log"); \
2657- print line; \
2658- }; \
2659- printf "\n"; \
2660- }; \
2661- close ($$0 ".trs"); \
2662- close ($$0 ".log"); \
2663-}'
2664-# Restructured Text title.
2665-am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
2666-# Solaris 10 'make', and several other traditional 'make' implementations,
2667-# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
2668-# by disabling -e (using the XSI extension "set +e") if it's set.
2669-am__sh_e_setup = case $$- in *e*) set +e;; esac
2670-# Default flags passed to test drivers.
2671-am__common_driver_flags = \
2672- --color-tests "$$am__color_tests" \
2673- --enable-hard-errors "$$am__enable_hard_errors" \
2674- --expect-failure "$$am__expect_failure"
2675-# To be inserted before the command running the test. Creates the
2676-# directory for the log if needed. Stores in $dir the directory
2677-# containing $f, in $tst the test, in $log the log. Executes the
2678-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
2679-# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
2680-# will run the test scripts (or their associated LOG_COMPILER, if
2681-# thy have one).
2682-am__check_pre = \
2683-$(am__sh_e_setup); \
2684-$(am__vpath_adj_setup) $(am__vpath_adj) \
2685-$(am__tty_colors); \
2686-srcdir=$(srcdir); export srcdir; \
2687-case "$@" in \
2688- */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
2689- *) am__odir=.;; \
2690-esac; \
2691-test "x$$am__odir" = x"." || test -d "$$am__odir" \
2692- || $(MKDIR_P) "$$am__odir" || exit $$?; \
2693-if test -f "./$$f"; then dir=./; \
2694-elif test -f "$$f"; then dir=; \
2695-else dir="$(srcdir)/"; fi; \
2696-tst=$$dir$$f; log='$@'; \
2697-if test -n '$(DISABLE_HARD_ERRORS)'; then \
2698- am__enable_hard_errors=no; \
2699-else \
2700- am__enable_hard_errors=yes; \
2701-fi; \
2702-case " $(XFAIL_TESTS) " in \
2703- *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
2704- am__expect_failure=yes;; \
2705- *) \
2706- am__expect_failure=no;; \
2707-esac; \
2708-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
2709-# A shell command to get the names of the tests scripts with any registered
2710-# extension removed (i.e., equivalently, the names of the test logs, with
2711-# the '.log' extension removed). The result is saved in the shell variable
2712-# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
2713-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
2714-# since that might cause problem with VPATH rewrites for suffix-less tests.
2715-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
2716-am__set_TESTS_bases = \
2717- bases='$(TEST_LOGS)'; \
2718- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
2719- bases=`echo $$bases`
2720-RECHECK_LOGS = $(TEST_LOGS)
2721-AM_RECURSIVE_TARGETS = check recheck
2722-TEST_SUITE_LOG = test-suite.log
2723-TEST_EXTENSIONS = @EXEEXT@ .test
2724-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
2725-am__set_b = \
2726- case '$@' in \
2727- */*) \
2728- case '$*' in \
2729- */*) b='$*';; \
2730- *) b=`echo '$@' | sed 's/\.log$$//'`; \
2731- esac;; \
2732- *) \
2733- b='$*';; \
2734- esac
2735-am__test_logs1 = $(TESTS:=.log)
2736-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
2737-TEST_LOGS = $(am__test_logs2:.test.log=.log)
2738-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
2739-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
2740- $(TEST_LOG_FLAGS)
2741 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2742 ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@
2743 ACLOCAL = @ACLOCAL@
2744@@ -539,6 +384,8 @@
2745 POSUB = @POSUB@
2746 RANLIB = @RANLIB@
2747 SED = @SED@
2748+SELINUX_CFLAGS = @SELINUX_CFLAGS@
2749+SELINUX_LIBS = @SELINUX_LIBS@
2750 SET_MAKE = @SET_MAKE@
2751 SHELL = @SHELL@
2752 STRIP = @STRIP@
2753@@ -771,7 +618,7 @@
2754 $(MAKE) $(AM_MAKEFLAGS) all-am
2755
2756 .SUFFIXES:
2757-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
2758+.SUFFIXES: .c .lo .o .obj
2759 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
2760 @for dep in $?; do \
2761 case '$(am__configure_deps)' in \
2762@@ -1199,189 +1046,98 @@
2763 distclean-tags:
2764 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
2765
2766-# Recover from deleted '.trs' file; this should ensure that
2767-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
2768-# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
2769-# to avoid problems with "make -n".
2770-.log.trs:
2771- rm -f $< $@
2772- $(MAKE) $(AM_MAKEFLAGS) $<
2773-
2774-# Leading 'am--fnord' is there to ensure the list of targets does not
2775-# expand to empty, as could happen e.g. with make check TESTS=''.
2776-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
2777-am--force-recheck:
2778- @:
2779-
2780-$(TEST_SUITE_LOG): $(TEST_LOGS)
2781- @$(am__set_TESTS_bases); \
2782- am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
2783- redo_bases=`for i in $$bases; do \
2784- am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
2785- done`; \
2786- if test -n "$$redo_bases"; then \
2787- redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
2788- redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
2789- if $(am__make_dryrun); then :; else \
2790- rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
2791- fi; \
2792- fi; \
2793- if test -n "$$am__remaking_logs"; then \
2794- echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
2795- "recursion detected" >&2; \
2796- else \
2797- am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
2798- fi; \
2799- if $(am__make_dryrun); then :; else \
2800- st=0; \
2801- errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
2802- for i in $$redo_bases; do \
2803- test -f $$i.trs && test -r $$i.trs \
2804- || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
2805- test -f $$i.log && test -r $$i.log \
2806- || { echo "$$errmsg $$i.log" >&2; st=1; }; \
2807+check-TESTS: $(TESTS)
2808+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
2809+ srcdir=$(srcdir); export srcdir; \
2810+ list=' $(TESTS) '; \
2811+ $(am__tty_colors); \
2812+ if test -n "$$list"; then \
2813+ for tst in $$list; do \
2814+ if test -f ./$$tst; then dir=./; \
2815+ elif test -f $$tst; then dir=; \
2816+ else dir="$(srcdir)/"; fi; \
2817+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
2818+ all=`expr $$all + 1`; \
2819+ case " $(XFAIL_TESTS) " in \
2820+ *[\ \ ]$$tst[\ \ ]*) \
2821+ xpass=`expr $$xpass + 1`; \
2822+ failed=`expr $$failed + 1`; \
2823+ col=$$red; res=XPASS; \
2824+ ;; \
2825+ *) \
2826+ col=$$grn; res=PASS; \
2827+ ;; \
2828+ esac; \
2829+ elif test $$? -ne 77; then \
2830+ all=`expr $$all + 1`; \
2831+ case " $(XFAIL_TESTS) " in \
2832+ *[\ \ ]$$tst[\ \ ]*) \
2833+ xfail=`expr $$xfail + 1`; \
2834+ col=$$lgn; res=XFAIL; \
2835+ ;; \
2836+ *) \
2837+ failed=`expr $$failed + 1`; \
2838+ col=$$red; res=FAIL; \
2839+ ;; \
2840+ esac; \
2841+ else \
2842+ skip=`expr $$skip + 1`; \
2843+ col=$$blu; res=SKIP; \
2844+ fi; \
2845+ echo "$${col}$$res$${std}: $$tst"; \
2846 done; \
2847- test $$st -eq 0 || exit 1; \
2848- fi
2849- @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
2850- ws='[ ]'; \
2851- results=`for b in $$bases; do echo $$b.trs; done`; \
2852- test -n "$$results" || results=/dev/null; \
2853- all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
2854- pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
2855- fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
2856- skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
2857- xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
2858- xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
2859- error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
2860- if test `expr $$fail + $$xpass + $$error` -eq 0; then \
2861- success=true; \
2862- else \
2863- success=false; \
2864- fi; \
2865- br='==================='; br=$$br$$br$$br$$br; \
2866- result_count () \
2867- { \
2868- if test x"$$1" = x"--maybe-color"; then \
2869- maybe_colorize=yes; \
2870- elif test x"$$1" = x"--no-color"; then \
2871- maybe_colorize=no; \
2872- else \
2873- echo "$@: invalid 'result_count' usage" >&2; exit 4; \
2874- fi; \
2875- shift; \
2876- desc=$$1 count=$$2; \
2877- if test $$maybe_colorize = yes && test $$count -gt 0; then \
2878- color_start=$$3 color_end=$$std; \
2879- else \
2880- color_start= color_end=; \
2881- fi; \
2882- echo "$${color_start}# $$desc $$count$${color_end}"; \
2883- }; \
2884- create_testsuite_report () \
2885- { \
2886- result_count $$1 "TOTAL:" $$all "$$brg"; \
2887- result_count $$1 "PASS: " $$pass "$$grn"; \
2888- result_count $$1 "SKIP: " $$skip "$$blu"; \
2889- result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
2890- result_count $$1 "FAIL: " $$fail "$$red"; \
2891- result_count $$1 "XPASS:" $$xpass "$$red"; \
2892- result_count $$1 "ERROR:" $$error "$$mgn"; \
2893- }; \
2894- { \
2895- echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
2896- $(am__rst_title); \
2897- create_testsuite_report --no-color; \
2898- echo; \
2899- echo ".. contents:: :depth: 2"; \
2900- echo; \
2901- for b in $$bases; do echo $$b; done \
2902- | $(am__create_global_log); \
2903- } >$(TEST_SUITE_LOG).tmp || exit 1; \
2904- mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
2905- if $$success; then \
2906- col="$$grn"; \
2907- else \
2908- col="$$red"; \
2909- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
2910- fi; \
2911- echo "$${col}$$br$${std}"; \
2912- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
2913- echo "$${col}$$br$${std}"; \
2914- create_testsuite_report --maybe-color; \
2915- echo "$$col$$br$$std"; \
2916- if $$success; then :; else \
2917- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
2918- if test -n "$(PACKAGE_BUGREPORT)"; then \
2919- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
2920- fi; \
2921- echo "$$col$$br$$std"; \
2922- fi; \
2923- $$success || exit 1
2924-
2925-check-TESTS:
2926- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
2927- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
2928- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2929- @set +e; $(am__set_TESTS_bases); \
2930- log_list=`for i in $$bases; do echo $$i.log; done`; \
2931- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
2932- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
2933- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
2934- exit $$?;
2935-recheck: all $(check_PROGRAMS)
2936- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2937- @set +e; $(am__set_TESTS_bases); \
2938- bases=`for i in $$bases; do echo $$i; done \
2939- | $(am__list_recheck_tests)` || exit 1; \
2940- log_list=`for i in $$bases; do echo $$i.log; done`; \
2941- log_list=`echo $$log_list`; \
2942- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
2943- am__force_recheck=am--force-recheck \
2944- TEST_LOGS="$$log_list"; \
2945- exit $$?
2946-test_initctl.log: test_initctl$(EXEEXT)
2947- @p='test_initctl$(EXEEXT)'; \
2948- b='test_initctl'; \
2949- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2950- --log-file $$b.log --trs-file $$b.trs \
2951- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2952- "$$tst" $(AM_TESTS_FD_REDIRECT)
2953-test_utmp.log: test_utmp$(EXEEXT)
2954- @p='test_utmp$(EXEEXT)'; \
2955- b='test_utmp'; \
2956- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2957- --log-file $$b.log --trs-file $$b.trs \
2958- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2959- "$$tst" $(AM_TESTS_FD_REDIRECT)
2960-test_sysv.log: test_sysv$(EXEEXT)
2961- @p='test_sysv$(EXEEXT)'; \
2962- b='test_sysv'; \
2963- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2964- --log-file $$b.log --trs-file $$b.trs \
2965- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2966- "$$tst" $(AM_TESTS_FD_REDIRECT)
2967-test_telinit.log: test_telinit$(EXEEXT)
2968- @p='test_telinit$(EXEEXT)'; \
2969- b='test_telinit'; \
2970- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2971- --log-file $$b.log --trs-file $$b.trs \
2972- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2973- "$$tst" $(AM_TESTS_FD_REDIRECT)
2974-.test.log:
2975- @p='$<'; \
2976- $(am__set_b); \
2977- $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
2978- --log-file $$b.log --trs-file $$b.trs \
2979- $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
2980- "$$tst" $(AM_TESTS_FD_REDIRECT)
2981-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
2982-@am__EXEEXT_TRUE@ @p='$<'; \
2983-@am__EXEEXT_TRUE@ $(am__set_b); \
2984-@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
2985-@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
2986-@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
2987-@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
2988+ if test "$$all" -eq 1; then \
2989+ tests="test"; \
2990+ All=""; \
2991+ else \
2992+ tests="tests"; \
2993+ All="All "; \
2994+ fi; \
2995+ if test "$$failed" -eq 0; then \
2996+ if test "$$xfail" -eq 0; then \
2997+ banner="$$All$$all $$tests passed"; \
2998+ else \
2999+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
3000+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
3001+ fi; \
3002+ else \
3003+ if test "$$xpass" -eq 0; then \
3004+ banner="$$failed of $$all $$tests failed"; \
3005+ else \
3006+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
3007+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
3008+ fi; \
3009+ fi; \
3010+ dashes="$$banner"; \
3011+ skipped=""; \
3012+ if test "$$skip" -ne 0; then \
3013+ if test "$$skip" -eq 1; then \
3014+ skipped="($$skip test was not run)"; \
3015+ else \
3016+ skipped="($$skip tests were not run)"; \
3017+ fi; \
3018+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
3019+ dashes="$$skipped"; \
3020+ fi; \
3021+ report=""; \
3022+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
3023+ report="Please report to $(PACKAGE_BUGREPORT)"; \
3024+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
3025+ dashes="$$report"; \
3026+ fi; \
3027+ dashes=`echo "$$dashes" | sed s/./=/g`; \
3028+ if test "$$failed" -eq 0; then \
3029+ col="$$grn"; \
3030+ else \
3031+ col="$$red"; \
3032+ fi; \
3033+ echo "$${col}$$dashes$${std}"; \
3034+ echo "$${col}$$banner$${std}"; \
3035+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
3036+ test -z "$$report" || echo "$${col}$$report$${std}"; \
3037+ echo "$${col}$$dashes$${std}"; \
3038+ test "$$failed" -eq 0; \
3039+ else :; fi
3040
3041 distdir: $(DISTFILES)
3042 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
3043@@ -1444,9 +1200,6 @@
3044 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
3045 fi
3046 mostlyclean-generic:
3047- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
3048- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
3049- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
3050
3051 clean-generic:
3052 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
3053@@ -1553,9 +1306,9 @@
3054 installcheck-am installdirs maintainer-clean \
3055 maintainer-clean-generic maintainer-clean-local mostlyclean \
3056 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
3057- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
3058- uninstall-am uninstall-hook uninstall-man uninstall-man7 \
3059- uninstall-man8 uninstall-sbinPROGRAMS
3060+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
3061+ uninstall-hook uninstall-man uninstall-man7 uninstall-man8 \
3062+ uninstall-sbinPROGRAMS
3063
3064
3065 $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)

Subscribers

People subscribed via source and target branches

to all changes: