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/ssl_test | |
| 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/ssl_test')
| -rwxr-xr-x | qpid/cpp/src/tests/ssl_test | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test index 7f722361b3..da9b073d39 100755 --- a/qpid/cpp/src/tests/ssl_test +++ b/qpid/cpp/src/tests/ssl_test @@ -20,7 +20,6 @@ # # Run a simple test over SSL -source ./test_env.sh #set -x @@ -33,7 +32,7 @@ TEST_CLIENT_CERT=rumplestiltskin CA_PEM_FILE=${TEST_CERT_DIR}/ca_cert.pem OTHER_CA_CERT_DB=${TEST_CERT_DIR}/x_ca_cert_db OTHER_CA_PEM_FILE=${TEST_CERT_DIR}/other_ca_cert.pem -PY_PING_BROKER=$top_srcdir/src/tests/ping_broker +PY_PING_BROKER=${QPID_TEST_SRC_DIR}/ping_broker COUNT=10 trap cleanup EXIT @@ -144,7 +143,7 @@ start_ssl_mux_broker() { PORTS=( ${PORTS[@]} $1 ) } -sasl_config_dir=$builddir/sasl_config +sasl_config_dir=$QPID_TEST_EXEC_DIR/sasl_config start_authenticating_broker() { start_brokers 1 "--transport ssl --ssl-port 0 --require-encryption --ssl-sasl-no-dict --ssl-require-client-authentication --auth yes --sasl-config=${sasl_config_dir}" |