diff options
| -rw-r--r-- | cpp/tests/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
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 |