summaryrefslogtreecommitdiff
path: root/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-05-27 20:02:41 +0000
committerAlan Conway <aconway@apache.org>2010-05-27 20:02:41 +0000
commit9e82faab313bab906dc1e6e2dda02b4db9dbf993 (patch)
tree94a61638d14d20588414b3fe1386518d07c76f46 /cpp/src/tests/Makefile.am
parentb0ed6faecb9d7dbbe91ac39af6bbdc2ad412253c (diff)
downloadqpid-python-9e82faab313bab906dc1e6e2dda02b4db9dbf993.tar.gz
Fixed: authentication with bad credentials causes cluster broker to exit.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@948969 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/Makefile.am')
-rw-r--r--cpp/src/tests/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 061d7e88f6..5e5bfdec37 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -376,7 +376,7 @@ EXTRA_DIST+= \
check-long:
$(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND=
-check: python_prep test_env.sh
+check: python_prep test_env.sh sasl_config
PYTHON_SRC_DIR=$(abs_srcdir)/../../../python
PYTHON_BLD_DIR=$(abs_builddir)/python
@@ -391,4 +391,8 @@ python_prep:
--install-scripts=$(PYTHON_BLD_DIR)/commands; \
else echo "WARNING: python client not built, missing $(PYTHON_SRC_DIR)"; fi
+sasl_config: sasl_test_setup.sh
+ sh $(srcdir)/sasl_test_setup.sh
+ touch sasl_config
+
include testagent.mk