Author: mgoulish
Date: Tue May 25 10:08:41 2010
New Revision: 947994
URL: http://svn.apache.org/viewvc?rev=947994&view=rev
Log:
Removed sasl test db creation from the Makefile logic, and simply put it into
the test scripts where it is used. When mixed in with Makefiles, it was
breaking make targets like "install".
Removed:
qpid/trunk/qpid/cpp/src/sasl.mk
Modified:
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_soak
qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_test
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=947994&r1=947993&r2=947994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Tue May 25 10:08:41 2010
@@ -489,8 +489,6 @@ if HAVE_SASL
libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h
libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.cpp
libqpidcommon_la_LIBADD += -lsasl2
-
-include sasl.mk
endif
libqpidbroker_la_LIBADD = libqpidcommon.la -luuid
Modified: qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_soak
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_soak?rev=947994&r1=947993&r2=947994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_soak (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_soak Tue May 25
10:08:41 2010
@@ -1,4 +1,16 @@
#! /bin/bash
+SASL_PW=/usr/sbin/saslpasswd2
+SASLTEST_DB=./sasl_config/qpidd.sasldb
+
+if [ -e $SASL_PW ]
+then
+ echo "Building temporary sasl db."
+ rm -f $SASLTEST_DB
+ echo zig | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zig
+ echo zag | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zag
+fi
+
+# This test will return something reasonable whether or not sasl exists.
./cluster_authentication_soak 500
Modified: qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_test
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_test?rev=947994&r1=947993&r2=947994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_test (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cluster_authentication_test Tue May 25
10:08:41 2010
@@ -1,4 +1,16 @@
#! /bin/bash
+SASL_PW=/usr/sbin/saslpasswd2
+SASLTEST_DB=./sasl_config/qpidd.sasldb
+
+if [ -e $SASL_PW ]
+then
+ echo "Building temporary sasl db."
+ rm -f $SASLTEST_DB
+ echo zig | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zig
+ echo zag | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zag
+fi
+
+# This test will return something reasonable whether or not sasl exists.
./cluster_authentication_soak
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
