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/qpid@947994 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 24 insertions, 0 deletions

diff --git a/cpp/src/tests/run_cluster_authentication_soak b/cpp/src/tests/run_cluster_authentication_soak
index d0a9059097..2bb7a833f6 100755
--- a/cpp/src/tests/run_cluster_authentication_soak
+++ b/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/cpp/src/tests/run_cluster_authentication_test b/cpp/src/tests/run_cluster_authentication_test
index 5e71baf2e5..15597e7073 100755
--- a/cpp/src/tests/run_cluster_authentication_test
+++ b/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