[Pkg-mono-svn-commits] [mono] 22/30: Don't use killall to kill stray Mono processes, it doesn't work as desired. (Closes: #738277)

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/3.2.8+dfsg-1
in repository mono.

commit e2acadbd2565cdcff9b4730fe39e52593bbfa227
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Feb 20 07:13:34 2014 +0000

    Don't use killall to kill stray Mono processes, it doesn't work as desired. (Closes: #738277)
---
 debian/control | 2 +-
 debian/rules   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 77c67f0..2dc584d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
 Build-Depends: debhelper (>= 7),
 	dpkg-dev (>= 1.16.1~),
-	psmisc,
+	procps,
 	bison,
 	libtool,
 	libxml-dom-perl,
diff --git a/debian/rules b/debian/rules
index f5622f8..6f96739 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 
 RUN_MONO = LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/4.0 debian/tmp/usr/bin/mono
+KILL_MONO = pgrep mono | xargs kill -9
 DH_INTERNAL_MONO_PARAM = --internal-mono
 ifeq ($(shell dpkg --compare-versions $$(dpkg-query -f '$${Version}' -W debhelper) lt 7.1; echo $$?), 0)
 	DH_INTERNAL_MONO_PARAM = internal-mono
@@ -56,7 +57,6 @@ ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	MONO_SGEN_TEST = true
 else
 	TIMEOUT = timeout -k 1h 1h
-	KILL_MONO = killall -9 mono
 	MINI_TEST = cd mono/mini && $(TIMEOUT) make check; $(KILL_MONO)
 	MONO_BOEHM_TEST = cd mono/tests && MONO_ENV_OPTIONS=--gc=boehm $(TIMEOUT) make test; $(KILL_MONO)
 	MONO_SGEN_TEST = cd mono/tests && MONO_ENV_OPTIONS=--gc=sgen $(TIMEOUT) make test; $(KILL_MONO)
@@ -130,6 +130,7 @@ test-stamp: build-stamp
 	-$(MINI_TEST)
 	-$(MONO_BOEHM_TEST)
 	-$(MONO_SGEN_TEST)
+	-$(KILL_MONO)
 	# funny bug-459094.cs creates too long directory names which
 	# pbuilder is unable to remove, eh
 	rm -rf mono/tests/abcde12345abcde12345abcde12345abcde12345/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono.git