diff options
| author | Gordon Sim <gsim@apache.org> | 2013-07-17 10:03:59 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-07-17 10:03:59 +0000 |
| commit | 1df3d1f6867ba01cf4d309949b0e08f3118c90b6 (patch) | |
| tree | 153519762a076426fc3612f101ef51d34ee34cf6 /qpid/cpp/src/tests/swig_python_tests | |
| parent | 850e80ea566fc4d9662ce236351a88f32440517a (diff) | |
| download | qpid-python-1df3d1f6867ba01cf4d309949b0e08f3118c90b6.tar.gz | |
QPID-4988: fix test script for case where AMQP 1.0 support is not built
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1504065 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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests index adf08cbc63..2c5ad3b3b2 100755 --- a/qpid/cpp/src/tests/swig_python_tests +++ b/qpid/cpp/src/tests/swig_python_tests @@ -23,7 +23,8 @@ source ./test_env.sh trap stop_broker INT TERM QUIT -if [ -f $AMQP_LIB ] ; then +if [[ -a $AMQP_LIB ]] ; then + echo "Found AMQP support: $AMQP_LIB" MODULES="--load-module $AMQP_LIB" fi @@ -49,10 +50,10 @@ start_broker echo "Running swigged python tests using broker on port $QPID_PORT" export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG -export QPID_LOAD_MODULE=$AMQPC_LIB $QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests RESULT=$? -if [ -f $AMQPC_LIB ] ; then +if [[ -a $AMQPC_LIB ]] ; then + export QPID_LOAD_MODULE=$AMQPC_LIB $QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests if test x$RESULT == x0; then RESULT=$? |