From deb23c3b6d41d964eae43e44a97c51fb02466355 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 7 Aug 2013 20:55:26 +0000 Subject: 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/qpid@1511483 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/swig_python_tests | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'cpp/src/tests/swig_python_tests') diff --git a/cpp/src/tests/swig_python_tests b/cpp/src/tests/swig_python_tests index 2c5ad3b3b2..2ad17ebc33 100755 --- a/cpp/src/tests/swig_python_tests +++ b/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 -- cgit v1.2.1