diff options
| author | Alan Conway <aconway@apache.org> | 2008-11-18 19:55:59 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-11-18 19:55:59 +0000 |
| commit | 5a47f4956fb6dc06c297e334e9db6e7efefe7cd4 (patch) | |
| tree | cabf3c19f5ce737cb9ba3d66f19670b62683ff11 /qpid/cpp/src/tests | |
| parent | 146c1f0d3cd2089cc8925bbc6a6329980b977a4a (diff) | |
| download | qpid-python-5a47f4956fb6dc06c297e334e9db6e7efefe7cd4.tar.gz | |
Optional cluster integration with cman quorum service.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@718693 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/cluster.mk | 10 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/ssl_test | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk index 88574943fd..95d8d0f034 100644 --- a/qpid/cpp/src/tests/cluster.mk +++ b/qpid/cpp/src/tests/cluster.mk @@ -1,10 +1,10 @@ -if CPG + +if HAVE_LIBCPG + # # Cluster tests makefile fragment, to be included in Makefile.am # -lib_cluster = $(abs_builddir)/../cluster.la - # NOTE: Programs using the openais library must be run with gid=ais # You should do "newgrp ais" before running the tests to run these. # @@ -16,8 +16,8 @@ EXTRA_DIST+=ais_check start_cluster stop_cluster check_PROGRAMS+=cluster_test cluster_test_SOURCES=unit_test.cpp cluster_test.cpp -cluster_test_LDADD=$(lib_client) $(lib_cluster) -lboost_unit_test_framework +cluster_test_LDADD=$(lib_client) ../cluster.la -lboost_unit_test_framework -unit_test_LDADD+=$(lib_cluster) +unit_test_LDADD+=../cluster.la endif diff --git a/qpid/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test index 2a12c79c5b..9fc54008b7 100755 --- a/qpid/cpp/src/tests/ssl_test +++ b/qpid/cpp/src/tests/ssl_test @@ -19,8 +19,7 @@ create_certs() { } start_broker() { - ../qpidd --daemon --transport ssl --port 0 --ssl-port 0 --no-data-dir --no-module-dir --auth no --config $CONFIG\ - --load-module ../.libs/ssl.so --ssl-cert-db $CERT_DIR --ssl-cert-password-file $CERT_PW_FILE > qpidd.port + ../qpidd --daemon --transport ssl --port 0 --ssl-port 0 --no-data-dir --no-module-dir --auth no --config $CONFIG --load-module ../.libs/ssl.so --ssl-cert-db $CERT_DIR --ssl-cert-password-file $CERT_PW_FILE > qpidd.port PORT=`cat qpidd.port` } |