summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2008-11-13 00:46:31 +0000
committerTed Ross <tross@apache.org>2008-11-13 00:46:31 +0000
commit726494e8b3d6eb93a500d2e06a707fea5ce3dfd3 (patch)
treed186b97069a9b58a525c59e8127493890758cb4e /qpid/cpp/src/tests
parent1bf6e3cb632d3ba0e2ea90a4124ff7e532f4aef8 (diff)
downloadqpid-python-726494e8b3d6eb93a500d2e06a707fea5ce3dfd3.tar.gz
Added null config for SSL test. This test will malfunction if there is
already a config file in the default location with SSL configuration in it. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@713583 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
-rw-r--r--qpid/cpp/src/tests/config.null1
-rwxr-xr-xqpid/cpp/src/tests/ssl_test2
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/config.null b/qpid/cpp/src/tests/config.null
new file mode 100644
index 0000000000..565c7da435
--- /dev/null
+++ b/qpid/cpp/src/tests/config.null
@@ -0,0 +1 @@
+# empty config
diff --git a/qpid/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test
index d0bd3b6f95..94ada650c9 100755
--- a/qpid/cpp/src/tests/ssl_test
+++ b/qpid/cpp/src/tests/ssl_test
@@ -18,7 +18,7 @@ create_certs() {
}
start_broker() {
- ../qpidd --daemon --transport ssl --port 0 --ssl-port 0 --no-data-dir --no-module-dir --auth no\
+ ../qpidd --daemon --transport ssl --port 0 --ssl-port 0 --no-data-dir --no-module-dir --auth no --config config.null\
--load-module ../.libs/ssl.so --ssl-cert-db $CERT_DIR --ssl-cert-password-file $CERT_PW_FILE > qpidd.port
PORT=`cat qpidd.port`
}