Author: mgoulish
Date: Fri Oct 29 18:51:11 2010
New Revision: 1028878
URL: http://svn.apache.org/viewvc?rev=1028878&view=rev
Log:
Prevent sasl_fed from blowing up in a distro, or "make distcheck",
by bailing out if the python tools that it needs are absent.
Modified:
qpid/trunk/qpid/cpp/src/tests/sasl_fed
Modified: qpid/trunk/qpid/cpp/src/tests/sasl_fed
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed?rev=1028878&r1=1028877&r2=1028878&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed Fri Oct 29 18:51:11 2010
@@ -19,7 +19,7 @@
# under the License.
#
-source test_env.sh
+source ./test_env.sh
# This minimum value corresponds to sasl version 2.1.22
minimum_sasl_version=131350
@@ -33,6 +33,13 @@ if [ "$sasl_version" -lt "$minimum_sasl
exit 0
fi
+# In a distribution, the python tools will be absent.
+if [ ! -f $QPID_CONFIG_EXEC ] || [ ! -f $QPID_ROUTE_EXEC ] ; then
+ echo "python tools absent - skipping sasl_fed."
+ exit 0
+fi
+
+
sasl_config_file=$builddir/sasl_config
my_random_number=$RANDOM
@@ -86,23 +93,23 @@ EXCHANGE_NAME=sasl_fedex
#--------------------------------------------------
#echo " add exchanges"
#--------------------------------------------------
-$PYTHON_COMMANDS/qpid-config -a localhost:$broker_1_port add exchange direct
$EXCHANGE_NAME
-$PYTHON_COMMANDS/qpid-config -a localhost:$broker_2_port add exchange direct
$EXCHANGE_NAME
+$QPID_CONFIG_EXEC -a localhost:$broker_1_port add exchange direct
$EXCHANGE_NAME
+$QPID_CONFIG_EXEC -a localhost:$broker_2_port add exchange direct
$EXCHANGE_NAME
#--------------------------------------------------
#echo " add queues"
#--------------------------------------------------
-$PYTHON_COMMANDS/qpid-config -a localhost:$broker_1_port add queue $QUEUE_NAME
-$PYTHON_COMMANDS/qpid-config -a localhost:$broker_2_port add queue $QUEUE_NAME
+$QPID_CONFIG_EXEC -a localhost:$broker_1_port add queue $QUEUE_NAME
+$QPID_CONFIG_EXEC -a localhost:$broker_2_port add queue $QUEUE_NAME
sleep 5
#--------------------------------------------------
#echo " create bindings"
#--------------------------------------------------
-$PYTHON_COMMANDS/qpid-config -a localhost:$broker_1_port bind $EXCHANGE_NAME
$QUEUE_NAME $ROUTING_KEY
-$PYTHON_COMMANDS/qpid-config -a localhost:$broker_2_port bind $EXCHANGE_NAME
$QUEUE_NAME $ROUTING_KEY
+$QPID_CONFIG_EXEC -a localhost:$broker_1_port bind $EXCHANGE_NAME $QUEUE_NAME
$ROUTING_KEY
+$QPID_CONFIG_EXEC -a localhost:$broker_2_port bind $EXCHANGE_NAME $QUEUE_NAME
$ROUTING_KEY
sleep 5
@@ -110,7 +117,7 @@ sleep 5
#--------------------------------------------------
#echo " qpid-route route add"
#--------------------------------------------------
-$PYTHON_COMMANDS/qpid-route route add zag/z...@localhost:$broker_2_port
zag/z...@localhost:$broker_1_port $EXCHANGE_NAME $ROUTING_KEY "" "" DIGEST-MD5
+$QPID_ROUTE_EXEC route add zag/z...@localhost:$broker_2_port
zag/z...@localhost:$broker_1_port $EXCHANGE_NAME $ROUTING_KEY "" "" DIGEST-MD5
sleep 5
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
