summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/swig_python_tests
diff options
context:
space:
mode:
authorCharles E. Rolke <chug@apache.org>2013-10-04 17:41:50 +0000
committerCharles E. Rolke <chug@apache.org>2013-10-04 17:41:50 +0000
commitb5e8213e065218d4f1c21bb4819f6420c4d3fcd1 (patch)
tree7cb65b0a4714a106dc0bf9966278bbfa98c07273 /qpid/cpp/src/tests/swig_python_tests
parent9e1b387c6b52bc8077650fbc96bf0329e05c1f27 (diff)
downloadqpid-python-b5e8213e065218d4f1c21bb4819f6420c4d3fcd1.tar.gz
QPID-5115: AMQP 1.0 client support built in to qpidmessaging for all platforms
This commit disposes of the amqpc library and moves the functions into the qpidmessaging library. Now any client that loads qpidmessaging gets amqp0-10 and amqp1.0 selectable through the connection protocol option. C++ brokers still must load the amqp library to enable 1.0 support. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529235 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/swig_python_tests')
-rwxr-xr-xqpid/cpp/src/tests/swig_python_tests3
1 files changed, 1 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests
index a10878f712..3741e3c699 100755
--- a/qpid/cpp/src/tests/swig_python_tests
+++ b/qpid/cpp/src/tests/swig_python_tests
@@ -52,8 +52,7 @@ echo "Running swigged python tests using broker on port $QPID_PORT"
export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG
export QPID_USE_SWIG_CLIENT=1
$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 || FAILED=1
-if [[ -a $AMQPC_LIB ]] ; then
- export QPID_LOAD_MODULE=$AMQPC_LIB
+if [[ -a $AMQP_LIB ]] ; then
$QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -m qpid_tests.broker_0_10.new_api -m assertions -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests || FAILED=1
fi
stop_broker