summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/swig_python_tests
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-08-07 20:55:26 +0000
committerGordon Sim <gsim@apache.org>2013-08-07 20:55:26 +0000
commitf86362ea595e0a574d0b5cd3f15ff03f31cdadbe (patch)
tree66d6f78a1550407edb50491262c0ab5045575e88 /qpid/cpp/src/tests/swig_python_tests
parenta001783ce1f9d097b8b031a4522ed351b1be697d (diff)
downloadqpid-python-f86362ea595e0a574d0b5cd3f15ff03f31cdadbe.tar.gz
QPID-5051: fixes for swig test failures on RHEL5 (and the failure to detect them)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1511483 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/swig_python_tests')
-rwxr-xr-xqpid/cpp/src/tests/swig_python_tests10
1 files changed, 3 insertions, 7 deletions
diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests
index 2c5ad3b3b2..2ad17ebc33 100755
--- a/qpid/cpp/src/tests/swig_python_tests
+++ b/qpid/cpp/src/tests/swig_python_tests
@@ -50,17 +50,13 @@ start_broker
echo "Running swigged python tests using broker on port $QPID_PORT"
export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG
-$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=$?
+$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
- $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=$?
- fi
+ $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 || FAILED=1
fi
stop_broker
-if test x$RESULT != x0; then
+if [[ $FAILED -eq 1 ]]; then
fail ""
fi