From c900a494882e28ccf0c38732eb4dd4e5d56df371 Mon Sep 17 00:00:00 2001 From: Michael Goulish Date: Tue, 25 May 2010 10:08:41 +0000 Subject: 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". git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@947994 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/run_cluster_authentication_soak | 12 ++++++++++++ qpid/cpp/src/tests/run_cluster_authentication_test | 12 ++++++++++++ 2 files changed, 24 insertions(+) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/run_cluster_authentication_soak b/qpid/cpp/src/tests/run_cluster_authentication_soak index d0a9059097..2bb7a833f6 100755 --- a/qpid/cpp/src/tests/run_cluster_authentication_soak +++ b/qpid/cpp/src/tests/run_cluster_authentication_soak @@ -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 diff --git a/qpid/cpp/src/tests/run_cluster_authentication_test b/qpid/cpp/src/tests/run_cluster_authentication_test index 5e71baf2e5..15597e7073 100755 --- a/qpid/cpp/src/tests/run_cluster_authentication_test +++ b/qpid/cpp/src/tests/run_cluster_authentication_test @@ -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 -- cgit v1.2.1