You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mg...@apache.org on 2011/03/18 03:44:42 UTC
svn commit: r1082804 - /qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex
Author: mgoulish
Date: Fri Mar 18 02:44:42 2011
New Revision: 1082804
URL: http://svn.apache.org/viewvc?rev=1082804&view=rev
Log:
QPID-3152
The non-clustered versions of the sasl_fed_ex tests should probably not attempt to load cluster.so.
Modified:
qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex
Modified: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex?rev=1082804&r1=1082803&r2=1082804&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex Fri Mar 18 02:44:42 2011
@@ -160,7 +160,7 @@ export QPID_SSL_CERT_NAME=${TEST_HOSTNAM
COMMON_BROKER_OPTIONS=" \
--ssl-sasl-no-dict \
- --sasl-config=$sasl_config_dir \
+ --sasl-config=$sasl_config_dir \
--ssl-require-client-authentication \
--auth yes \
--ssl-cert-db $CERT_DIR \
@@ -169,7 +169,6 @@ COMMON_BROKER_OPTIONS="
--no-data-dir \
--no-module-dir \
--load-module ${SSL_LIB} \
- --load-module ${CLUSTER_LIB} \
--mgmt-enable=yes \
--log-enable info+ \
--log-source yes \
@@ -186,6 +185,7 @@ function start_brokers {
--port=${SRC_TCP_PORT} \
--ssl-port ${SRC_SSL_PORT} \
${COMMON_BROKER_OPTIONS} \
+ --load-module ${CLUSTER_LIB} \
--cluster-name ${CLUSTER_1_NAME} \
--log-to-file $tmp_root/qpidd_src.log 2> /dev/null
@@ -196,6 +196,7 @@ function start_brokers {
--port=${SRC_TCP_PORT_2} \
--ssl-port ${SRC_SSL_PORT_2} \
${COMMON_BROKER_OPTIONS} \
+ --load-module ${CLUSTER_LIB} \
--cluster-name ${CLUSTER_1_NAME} \
--log-to-file $tmp_root/qpidd_src_2.log 2> /dev/null
@@ -209,6 +210,7 @@ function start_brokers {
--port=${DST_TCP_PORT} \
--ssl-port ${DST_SSL_PORT} \
${COMMON_BROKER_OPTIONS} \
+ --load-module ${CLUSTER_LIB} \
--cluster-name ${CLUSTER_2_NAME} \
--log-to-file $tmp_root/qpidd_dst.log 2> /dev/null
@@ -219,6 +221,7 @@ function start_brokers {
--port=${DST_TCP_PORT_2} \
--ssl-port ${DST_SSL_PORT_2} \
${COMMON_BROKER_OPTIONS} \
+ --load-module ${CLUSTER_LIB} \
--cluster-name ${CLUSTER_2_NAME} \
--log-to-file $tmp_root/qpidd_dst_2.log 2> /dev/null
@@ -329,12 +332,10 @@ halt_brokers
sleep 1
-print "Removing temporary directory $tmp_root"
-rm -rf $tmp_root
-
-
if [ ${link_status} == "Operational" ]; then
print "result: good"
+ print "Removing temporary directory $tmp_root"
+ rm -rf $tmp_root
exit 0
fi
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org