You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2013/07/17 12:03:59 UTC

svn commit: r1504065 - /qpid/trunk/qpid/cpp/src/tests/swig_python_tests

Author: gsim
Date: Wed Jul 17 10:03:59 2013
New Revision: 1504065

URL: http://svn.apache.org/r1504065
Log:
QPID-4988: fix test script for case where AMQP 1.0 support is not built

Modified:
    qpid/trunk/qpid/cpp/src/tests/swig_python_tests

Modified: qpid/trunk/qpid/cpp/src/tests/swig_python_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/swig_python_tests?rev=1504065&r1=1504064&r2=1504065&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/swig_python_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/swig_python_tests Wed Jul 17 10:03:59 2013
@@ -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=$?



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org