diff options
| author | Alan Conway <aconway@apache.org> | 2008-02-01 18:02:42 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-02-01 18:02:42 +0000 |
| commit | 956866626ca7b11cc55061ccf56959f978d586ec (patch) | |
| tree | faf661d0319505a2b4c57bc63ce6c03c3b7edf39 /qpid/cpp/src/tests/cluster.mk | |
| parent | d7c06001e741bd73d371021576452707afbcb1a9 (diff) | |
| download | qpid-python-956866626ca7b11cc55061ccf56959f978d586ec.tar.gz | |
Cluster code fixed for changes in codebase.
- Using SessionManager::Observer
- Better ais test setup, only need to be member of ais group.
- Update cluster_client
- SessionState holds handler chains.
- Cluster frames include next handler ptr.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@617582 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/cluster.mk')
| -rw-r--r-- | qpid/cpp/src/tests/cluster.mk | 63 |
1 files changed, 14 insertions, 49 deletions
diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk index a6f7fa90b4..3db0604e2c 100644 --- a/qpid/cpp/src/tests/cluster.mk +++ b/qpid/cpp/src/tests/cluster.mk @@ -1,55 +1,20 @@ -# FIXME aconway 2007-08-31: Disabled cluster compilation, -# has not been kept up to date with recent commits. +if CLUSTER +# +# Cluster tests makefile fragment, to be included in Makefile.am # -# if CLUSTER -# # Cluster tests makefile fragment, to be included in Makefile.am -# # +lib_cluster = $(abs_builddir)/../libqpidcluster.la -# lib_cluster = $(abs_builddir)/../libqpidcluster.la - -# # NOTE: Programs using the openais library must be run with gid=ais -# # You should do "newgrp ais" before running the tests to run these. -# # - -# # -# # Cluster tests. -# # - -# # ais_check runs ais if the conditions to run AIS tests -# # are met, otherwise it prints a warning. -# TESTS+=ais_check -# EXTRA_DIST+=ais_check -# AIS_TESTS= - -# ais_check: ais_tests -# ais_tests: -# echo $(AIS_TESTS) -# echo "# AIS tests" >$@ -# for t in $(AIS_TESTS); do echo ./$$t >$@; done -# chmod a+x $@ - -# CLEANFILES+=ais_tests - -# AIS_TESTS+=Cpg -# check_PROGRAMS+=Cpg -# Cpg_SOURCES=Cpg.cpp -# Cpg_LDADD=$(lib_cluster) -lboost_unit_test_framework - -# # TODO aconway 2007-07-26: Fix this test. -# #AIS_TESTS+=Cluster -# # check_PROGRAMS+=Cluster -# # Cluster_SOURCES=Cluster.cpp Cluster.h -# # Cluster_LDADD=$(lib_cluster) -lboost_unit_test_framework +# NOTE: Programs using the openais library must be run with gid=ais +# You should do "newgrp ais" before running the tests to run these. +# -# check_PROGRAMS+=Cluster_child -# Cluster_child_SOURCES=Cluster_child.cpp Cluster.h -# Cluster_child_LDADD=$(lib_cluster) -lboost_test_exec_monitor +# ais_check checks conditions for AIS tests and runs if ok. +TESTS+=ais_check +EXTRA_DIST+=ais_check ais_run -# # TODO aconway 2007-07-03: In progress -# #AIS_TESTS+=cluster_client -# check_PROGRAMS+=cluster_client -# cluster_client_SOURCES=cluster_client.cpp -# cluster_client_LDADD=$(lib_client) -lboost_unit_test_framework +check_PROGRAMS+=ais_test +ais_test_SOURCES=ais_test.cpp Cpg.cpp +ais_test_LDADD=$(lib_client) $(lib_cluster) -lboost_unit_test_framework -# endif +endif |