diff options
| author | Michael Goulish <mgoulish@apache.org> | 2010-10-29 18:51:11 +0000 |
|---|---|---|
| committer | Michael Goulish <mgoulish@apache.org> | 2010-10-29 18:51:11 +0000 |
| commit | 688ebc371560c210461a567b62107f01a3d93a22 (patch) | |
| tree | 0c1ccd442f6885c1722f811686d4d27e7d380d68 /qpid/cpp/src | |
| parent | d7ab0ad10315ea5fcca15e88993c523c23be53ea (diff) | |
| download | qpid-python-688ebc371560c210461a567b62107f01a3d93a22.tar.gz | |
Prevent sasl_fed from blowing up in a distro, or "make distcheck",
by bailing out if the python tools that it needs are absent.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1028878 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rwxr-xr-x | qpid/cpp/src/tests/sasl_fed | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/qpid/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed index e52b85c87f..6e90ccc8d6 100755 --- a/qpid/cpp/src/tests/sasl_fed +++ b/qpid/cpp/src/tests/sasl_fed @@ -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_version" ]; then 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/zag@localhost:$broker_2_port zag/zag@localhost:$broker_1_port $EXCHANGE_NAME $ROUTING_KEY "" "" DIGEST-MD5 +$QPID_ROUTE_EXEC route add zag/zag@localhost:$broker_2_port zag/zag@localhost:$broker_1_port $EXCHANGE_NAME $ROUTING_KEY "" "" DIGEST-MD5 sleep 5 |