diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-11-12 21:22:24 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-11-12 21:22:24 +0000 |
| commit | 780a3211d2b7a098455a6d8ec00067e6958119ba (patch) | |
| tree | 1a8922d6e23fa3141dc8555de17a7cc8bc59c6ee /qpid/cpp/src/tests/swig_python_tests | |
| parent | 0630ea05003e6c530b9dde889e8296b12e67e41b (diff) | |
| download | qpid-python-780a3211d2b7a098455a6d8ec00067e6958119ba.tar.gz | |
QPID-5330: Simplify testing for presence of python testing code -
this makes it much easier not to call the python testing code
when it isn't available
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1541241 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/swig_python_tests')
| -rwxr-xr-x | qpid/cpp/src/tests/swig_python_tests | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests index 2eb8ce67b3..1815372863 100755 --- a/qpid/cpp/src/tests/swig_python_tests +++ b/qpid/cpp/src/tests/swig_python_tests @@ -20,7 +20,10 @@ # # Run the python tests. -source ./test_env.sh +source $QPID_TEST_COMMON + +ensure_python_tests + trap stop_broker INT TERM QUIT if [[ -a $AMQP_LIB ]] ; then @@ -43,7 +46,6 @@ stop_broker() { $QPIDD_EXEC -q --port $QPID_PORT } -test -d $PYTHON_DIR || skip "no python dir" test -f $PYTHONSWIGMODULE || skip "no swigged python client" start_broker |