Merge lp:~3v1n0/bamf/tests-dbus-cleanup into lp:bamf

[Marco Trevisan (Treviño)]

Makefile.am.gtests: kill the launched dbus-daemon after running the tests

Kill the launched dbus-daemon when tests are over.

[lp:~3v1n0/bamf/tests-dbus-cleanup]

542. By Marco Trevisan (Treviño) on 2013-06-08

Makefile.am.gtests: kill the launched dbus-daemon after running the tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/bamf-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/45/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Tested in a pbuilder and it works. Approve.

review: Approve

=== modified file 'tests/Makefile.am.gtests'
--- tests/Makefile.am.gtests	2013-06-07 07:36:18 +0000
+++ tests/Makefile.am.gtests	2013-06-08 16:31:27 +0000
@@ -24,7 +24,11 @@
 	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
 	source $(LOG_PATH)/sessionbus.sh; \
 	\
-	make $(AM_MAKEFLAGS) -k test
+	make $(AM_MAKEFLAGS) -k test;
+	\
+	source $(LOG_PATH)/sessionbus.sh; \
+	rm $(LOG_PATH)/sessionbus.sh; \
+	kill $$DBUS_SESSION_BUS_PID;
 
 check-local: test-headless