diff options
author | Alan Conway <aconway@apache.org> | 2006-12-08 18:36:33 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2006-12-08 18:36:33 +0000 |
commit | 7ae7b599f4022e324b133386c5ac4c890680e084 (patch) | |
tree | e1117a6dd469dfd973ee11c525a0fefb6b8cb96c /cpp | |
parent | 2913fbc1e85376a60e9139ecd7eefcf0d78e054c (diff) | |
download | qpid-python-7ae7b599f4022e324b133386c5ac4c890680e084.tar.gz |
2006-12-08 Based on a patch by Jim Meyering <meyering@redhat.com>
* tests/Makefile.am (run-python-tests): Depend on ../src/qpidd.
Start a background job that will kill the daemon in 5 minutes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@484694 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/tests/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am index e52a3512f0..1aab82c307 100644 --- a/cpp/tests/Makefile.am +++ b/cpp/tests/Makefile.am @@ -70,11 +70,10 @@ check: run-unit-tests run-python-tests run-unit-tests: $(check_LTLIBRARIES) DllPlugInTester -c -b .libs/*.so -# TODO aconway 2006-12-01: Should also check for qpidd. -run-python-tests: $(check_LTLIBRARIES) - ../src/qpidd > qpidd.log 2>&1 & +run-python-tests: $(check_LTLIBRARIES) ../src/qpidd + ../src/qpidd > qpidd.log 2>&1 & echo $$! > qpidd.pid cd ../../python ; ./run-tests -v -I cpp_failing.txt - + kill `cat qpidd.pid` include gen.mk |