Author: cctrieloff
Date: Fri Dec 8 11:58:32 2006
New Revision: 484719
URL: http://svn.apache.org/viewvc?view=rev&rev=484719
Log:
2006-12-08 Jim Meyering <[EMAIL PROTECTED]>
* tests/Makefile.am (run-python-tests): Kill qpidd via a trap.
Don't let a failed/interrupted "make check" leave a running
qpidd process.
Modified:
incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/Makefile.am?view=diff&rev=484719&r1=484718&r2=484719
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/Makefile.am Fri Dec 8 11:58:32 2006
@@ -71,9 +71,10 @@
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
