diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-11-12 21:22:24 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-11-12 21:22:24 +0000 |
| commit | 780a3211d2b7a098455a6d8ec00067e6958119ba (patch) | |
| tree | 1a8922d6e23fa3141dc8555de17a7cc8bc59c6ee /qpid/cpp/src/tests/sasl_fed | |
| parent | 0630ea05003e6c530b9dde889e8296b12e67e41b (diff) | |
| download | qpid-python-780a3211d2b7a098455a6d8ec00067e6958119ba.tar.gz | |
QPID-5330: Simplify testing for presence of python testing code -
this makes it much easier not to call the python testing code
when it isn't available
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1541241 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/sasl_fed')
| -rwxr-xr-x | qpid/cpp/src/tests/sasl_fed | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed index a92ccd7b7a..48e5b4b40d 100755 --- a/qpid/cpp/src/tests/sasl_fed +++ b/qpid/cpp/src/tests/sasl_fed @@ -19,8 +19,6 @@ # under the License. # -source ./test_env.sh - # This minimum value corresponds to sasl version 2.1.22 minimum_sasl_version=131350 @@ -40,7 +38,7 @@ if [ ! -f $QPID_CONFIG_EXEC ] || [ ! -f $QPID_ROUTE_EXEC ] ; then fi -sasl_config_file=$builddir/sasl_config +sasl_config_file=$QPID_TEST_EXEC_DIR/sasl_config my_random_number=$RANDOM tmp_root=/tmp/sasl_fed_$my_random_number @@ -128,7 +126,7 @@ n_messages=100 #-------------------------------------------------- #echo " Sending 100 messages to $broker_1_port " #-------------------------------------------------- -$builddir/datagen --count $n_messages | $SENDER_EXEC --mechanism DIGEST-MD5 --username zag --password zag --exchange $EXCHANGE_NAME --routing-key $ROUTING_KEY --port $broker_1_port +$QPID_TEST_EXEC_DIR/datagen --count $n_messages | $SENDER_EXEC --mechanism DIGEST-MD5 --username zag --password zag --exchange $EXCHANGE_NAME --routing-key $ROUTING_KEY --port $broker_1_port sleep 5 |