From d0c37883f6d87ca7f46c3a6ef9f8c5facae69325 Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Fri, 8 Dec 2006 19:58:32 +0000 Subject: 2006-12-08 Jim Meyering * tests/Makefile.am (run-python-tests): Kill qpidd via a trap. Don't let a failed/interrupted "make check" leave a running qpidd process. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@484719 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/tests/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cpp') diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am index 1aab82c307..999d53df84 100644 --- a/cpp/tests/Makefile.am +++ b/cpp/tests/Makefile.am @@ -71,9 +71,10 @@ run-unit-tests: $(check_LTLIBRARIES) DllPlugInTester -c -b .libs/*.so run-python-tests: $(check_LTLIBRARIES) ../src/qpidd - ../src/qpidd > qpidd.log 2>&1 & echo $$! > qpidd.pid + ../src/qpidd > qpidd.log 2>&1 & pid=$$!; \ + trap 'status=$$?; kill $$pid; exit $$status' 0; \ + trap '(exit $$?); exit $$?' 1 2 13 15; \ cd ../../python ; ./run-tests -v -I cpp_failing.txt - kill `cat qpidd.pid` include gen.mk -- cgit v1.2.1