summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2010-05-24 18:25:46 +0000
committerMichael Goulish <mgoulish@apache.org>2010-05-24 18:25:46 +0000
commitba91599c45eeb8f3578cd34092302b2394b9ea69 (patch)
treeeca1f864eaa85a847ee10dab38554695f2aa5fc0 /qpid/cpp/src/tests/Makefile.am
parenta496df01eec8f7c9989c6ec9fe89ea864a6b9cf9 (diff)
downloadqpid-python-ba91599c45eeb8f3578cd34092302b2394b9ea69.tar.gz
Jira QPID-2617 -- make sasl-based tests config files relocatable
Before this change, sasl-based testing cannot be fully automated because the sasl db must be located in the standard installation location of /etc/sasl2. * Created a new directory "sasl_config" under cpp/src/tests * added a new makefile fragment "sasl.mk" to cpp/src/Makefile.am conditionally included basedon HAVE_SASL, which is defined by configure. ( NOTE: should be in cpp/src/tests/Makefile.am, but getting an "saslpasswd2: generic failure" when I try that. ) * The sasl.mk fragment uses saslpasswd2 to create a sasl db in cpp/src/tests/sasl_config that defines two users with eponymous passwords. * In test cluster_authentication_soak.cpp, make the cluster name random. * make SaslAuthenticator code accept and use a config path * give cluster_authentication_soak self-test capability. the test is meant to detect two problems: - broker failure - perftest hang so give it flags that will force either of those conditions. This allows me to (anually) ensure that the test really does detect those conditions when they occur. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@947748 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/Makefile.am')
-rw-r--r--qpid/cpp/src/tests/Makefile.am11
1 files changed, 7 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 92e4e858f7..99b226b004 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -314,7 +314,7 @@ TESTS_ENVIRONMENT = \
$(srcdir)/run_test
system_tests = qpid-client-test quick_perftest quick_topictest run_header_test quick_txtest
-TESTS += start_broker $(system_tests) python_tests stop_broker run_federation_tests run_acl_tests run_cli_tests replication_test
+TESTS += start_broker $(system_tests) python_tests stop_broker run_federation_tests run_acl_tests run_cli_tests replication_test run_cluster_authentication_test
EXTRA_DIST += \
run_test vg_check \
@@ -351,7 +351,8 @@ EXTRA_DIST += \
run_test.ps1 \
start_broker.ps1 \
stop_broker.ps1 \
- topictest.ps1
+ topictest.ps1 \
+ run_cluster_authentication_test
check_LTLIBRARIES += libdlclose_noop.la
libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir)
@@ -364,7 +365,8 @@ CLEANFILES+=valgrind.out *.log *.vglog* dummy_test qpidd.port $(unit_wrappers)
LONG_TESTS+=start_broker fanout_perftest shared_perftest multiq_perftest topic_perftest run_ring_queue_test stop_broker \
run_failover_soak reliable_replication_test \
- federated_cluster_test_with_node_failure
+ federated_cluster_test_with_node_failure \
+ run_cluster_authentication_soak
EXTRA_DIST+= \
fanout_perftest \
@@ -373,7 +375,8 @@ EXTRA_DIST+= \
topic_perftest \
run_failover_soak \
reliable_replication_test \
- federated_cluster_test_with_node_failure
+ federated_cluster_test_with_node_failure \
+ run_cluster_authentication_soak
check-long:
$(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND=