diff options
| author | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
| commit | 9bd37c771305c1744470bb24f5bf515ce8af5520 (patch) | |
| tree | ebccd7439ee2459aa7fe4f51fd2957dd4ce331fa /cpp/src/tests/ssl_test | |
| parent | 260ac89e2ac7596cd4ede19cbfb9c01dc7769827 (diff) | |
| download | qpid-python-9bd37c771305c1744470bb24f5bf515ce8af5520.tar.gz | |
Run cluster tests under cmake.
Various other test fixes.
- Env vars to abstract different library location under cmake/automake.
- More consistent use of env vars test_env.sh in test scripts.
- Fix replication/replicating_exchange mismatch.
- Add --no-module-dir to prevent accidentally loading modules.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@886259 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/ssl_test')
| -rwxr-xr-x | cpp/src/tests/ssl_test | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/tests/ssl_test b/cpp/src/tests/ssl_test index 2ce1d0bb81..528833076e 100755 --- a/cpp/src/tests/ssl_test +++ b/cpp/src/tests/ssl_test @@ -20,7 +20,6 @@ # # Run a simple test over SSL - source ./test_env.sh CONFIG=$(dirname $0)/config.null @@ -47,12 +46,12 @@ delete_certs() { } start_broker() { - PORT=`../qpidd --daemon --transport ssl --port 0 --ssl-port 0 --no-data-dir --no-module-dir --auth no --config $CONFIG --load-module $QPID_MODULE_DIR/ssl.so --ssl-cert-db $CERT_DIR --ssl-cert-password-file $CERT_PW_FILE --ssl-cert-name $TEST_HOSTNAME` + PORT=`../qpidd --daemon --transport ssl --port 0 --ssl-port 0 --no-data-dir --no-module-dir --auth no --config $CONFIG --load-module $SSL_LIB --ssl-cert-db $CERT_DIR --ssl-cert-password-file $CERT_PW_FILE --ssl-cert-name $TEST_HOSTNAME` } stop_broker() { if [[ $PORT ]] ; then - ../qpidd -q --port $PORT + $QPIDD_EXEC --no-module-dir -q --port $PORT fi } @@ -76,7 +75,7 @@ create_certs || error "Could not create test certificate" start_broker || error "Could not start broker" echo "Running SSL test on port $PORT" export QPID_NO_MODULE_DIR=1 -export QPID_LOAD_MODULE=$QPID_MODULE_DIR/sslconnector.so +export QPID_LOAD_MODULE=$SSLCONNECTOR_LIB export QPID_SSL_CERT_DB=${CERT_DIR} export QPID_SSL_CERT_PASSWORD_FILE=${CERT_PW_FILE} ./perftest --count ${COUNT} --port ${PORT} -P ssl -b $TEST_HOSTNAME --summary |