summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/cluster.mk
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2009-05-26 15:30:47 +0000
committerKim van der Riet <kpvdr@apache.org>2009-05-26 15:30:47 +0000
commit58a9619fe9fd83fcf806ea1ae716a0e0091a821d (patch)
tree916754a9d05271336d69501219f472167c82a0cc /qpid/cpp/src/tests/cluster.mk
parentcff7f8e8b36ee19947171a36a304eaa98dcccf8a (diff)
downloadqpid-python-58a9619fe9fd83fcf806ea1ae716a0e0091a821d.tar.gz
Added installable python cluster tests that can be run from an external store build/test environment and can test persistent clusters.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@778751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/cluster.mk')
-rw-r--r--qpid/cpp/src/tests/cluster.mk46
1 files changed, 37 insertions, 9 deletions
diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk
index e5e803003a..3e75d0bf87 100644
--- a/qpid/cpp/src/tests/cluster.mk
+++ b/qpid/cpp/src/tests/cluster.mk
@@ -29,17 +29,45 @@ if HAVE_LIBCPG
# ais_check checks pre-requisites for cluster tests and runs them if ok.
-TESTS+=ais_check federated_cluster_test clustered_replication_test
-EXTRA_DIST+=ais_check start_cluster stop_cluster restart_cluster cluster_python_tests cluster_python_tests_failing.txt \
- federated_cluster_test clustered_replication_test
+TESTS += \
+ ais_check \
+ run_cluster_tests \
+ federated_cluster_test \
+ clustered_replication_test
+
+EXTRA_DIST += \
+ ais_check \
+ start_cluster \
+ stop_cluster \
+ restart_cluster \
+ cluster_python_tests \
+ cluster_python_tests_failing.txt \
+ federated_cluster_test \
+ clustered_replication_test \
+ run_cluster_tests \
+ testlib.py \
+ cluster.py
+
-check_PROGRAMS+=cluster_test
-cluster_test_SOURCES=unit_test.cpp ClusterFixture.cpp ClusterFixture.h ForkedBroker.h ForkedBroker.cpp \
- cluster_test.cpp PartialFailure.cpp ClusterFailover.cpp
+unit_test_LDADD += ../cluster.la
-cluster_test_LDADD=$(lib_client) ../cluster.la test_store.la -lboost_unit_test_framework
+LONG_TESTS += \
+ start_cluster \
+ cluster_python_tests \
+ stop_cluster
-unit_test_LDADD+=../cluster.la
+qpidtest_PROGRAMS += cluster_test
+cluster_test_SOURCES = \
+ cluster_test.cpp \
+ unit_test.cpp \
+ ClusterFixture.cpp \
+ ClusterFixture.h \
+ ForkedBroker.h \
+ ForkedBroker.cpp \
+ PartialFailure.cpp \
+ ClusterFailover.cpp
+cluster_test_LDADD=$(lib_client) ../cluster.la test_store.la -lboost_unit_test_framework
+
+qpidtest_SCRIPTS += run_cluster_tests cluster.py testlib.py
-LONG_TESTS+=start_cluster cluster_python_tests stop_cluster
endif