[pygobject] Kill dbus-daemon after running tests
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] Kill dbus-daemon after running tests
- Date: Fri, 28 Sep 2012 05:00:33 +0000 (UTC)
commit 7f1422bf929976722edd6144beb0b4c96d74391b
Author: Martin Pitt <martinpitt gnome org>
Date: Fri Sep 28 06:59:38 2012 +0200
Kill dbus-daemon after running tests
dbus-launch does not kill the spawned dbus-daemon by itself (see
https://bugs.freedesktop.org/show_bug.cgi?id=39196), so do that after running
our tests. Take care to preserve the exit code.
https://bugzilla.gnome.org/show_bug.cgi?id=685009
tests/Makefile.am | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 081028a..db58f69 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -119,7 +119,10 @@ check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.t
@if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
@echo " CHECK PEP8"
@if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi
- $(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py
+ export `$(DBUS_LAUNCH)` && \
+ $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py; rc=$$?; \
+ kill $$DBUS_SESSION_BUS_PID; \
+ exit $$rc
check.gdb:
EXEC_NAME="gdb --args" $(MAKE) check
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]