diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 17:11:52 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 17:11:52 +0000 |
| commit | 7e5ceaf484253d00e17cb8579e802f12c1d06236 (patch) | |
| tree | 37e47003fb0d223f65f21fc3b2a698c255aec34e /qpid/cpp/src/tests/ssl_test | |
| parent | 706675d432369def04b47ab935a17adec390e202 (diff) | |
| download | qpid-python-7e5ceaf484253d00e17cb8579e802f12c1d06236.tar.gz | |
QPID-4938: No longer build acl or ssl support as plugins
(also remove final references to dead watchdog plugin)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494697 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 166892eeb0..7f722361b3 100755 --- a/qpid/cpp/src/tests/ssl_test +++ b/qpid/cpp/src/tests/ssl_test @@ -91,7 +91,7 @@ delete_certs() { } # Don't need --no-module-dir or --no-data-dir as they are set as env vars in test_env.sh -COMMON_OPTS="--daemon --config $CONFIG --load-module $SSL_LIB --ssl-cert-db $CERT_DB --ssl-cert-password-file $CERT_PW_FILE --ssl-cert-name $TEST_HOSTNAME" +COMMON_OPTS="--daemon --config $CONFIG --ssl-cert-db $CERT_DB --ssl-cert-password-file $CERT_PW_FILE --ssl-cert-name $TEST_HOSTNAME" # Start new brokers: # $1 must be integer @@ -124,7 +124,7 @@ stop_brokers() { pick_port() { # We need a fixed port to set --cluster-url. Use qpidd to pick a free port. - PICK=`../qpidd --no-module-dir -dp0` + PICK=`../qpidd --no-module-dir --listen-disable ssl -dp0` ../qpidd --no-module-dir -qp $PICK echo $PICK } @@ -173,7 +173,6 @@ start_ssl_broker PORT=${PORTS[0]} echo "Running SSL test on port $PORT" export QPID_NO_MODULE_DIR=1 -export QPID_LOAD_MODULE=$SSLCONNECTOR_LIB export QPID_SSL_CERT_DB=${CERT_DB} export QPID_SSL_CERT_PASSWORD_FILE=${CERT_PW_FILE} |