diff options
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/BrokerChannelTest.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | cpp/src/tests/cluster.mk | 102 |
3 files changed, 60 insertions, 52 deletions
diff --git a/cpp/src/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp index 0787405eb7..e975ec1b12 100644 --- a/cpp/src/tests/BrokerChannelTest.cpp +++ b/cpp/src/tests/BrokerChannelTest.cpp @@ -18,6 +18,11 @@ * under the License. * */ + +// FIXME aconway 2007-08-30: Rewrite as a Session test. +// There is an issue with the tests use of DeliveryAdapter +// which is no longer exposed on Session (part of SemanticHandler.) +// #include "qpid/broker/BrokerChannel.h" #include "qpid/broker/BrokerQueue.h" #include "qpid/broker/FanOutExchange.h" diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 611b498524..9d3d86b091 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -28,8 +28,8 @@ CLEANFILES= TESTS+=Blob check_PROGRAMS+=Blob -Blob_SOURCES=Blob.cpp ../qpid/framing/Blob.cpp -Blob_LDADD=-lboost_unit_test_framework +Blob_SOURCES=Blob.cpp +Blob_LDADD=-lboost_unit_test_framework $(lib_common) TESTS+=logging check_PROGRAMS+=logging @@ -80,7 +80,6 @@ perftest_LDADD=$(lib_client) # Unit tests broker_unit_tests = \ AccumulatedAckTest \ - BrokerChannelTest \ DtxWorkRecordTest \ ExchangeTest \ HeadersExchangeTest \ diff --git a/cpp/src/tests/cluster.mk b/cpp/src/tests/cluster.mk index 4c5ee2108b..a6f7fa90b4 100644 --- a/cpp/src/tests/cluster.mk +++ b/cpp/src/tests/cluster.mk @@ -1,51 +1,55 @@ -if CLUSTER -# Cluster tests makefile fragment, to be included in Makefile.am +# FIXME aconway 2007-08-31: Disabled cluster compilation, +# has not been kept up to date with recent commits. # -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 - -check_PROGRAMS+=Cluster_child -Cluster_child_SOURCES=Cluster_child.cpp Cluster.h -Cluster_child_LDADD=$(lib_cluster) -lboost_test_exec_monitor - -# 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 - -endif +# if CLUSTER +# # Cluster tests makefile fragment, to be included in Makefile.am +# # + +# 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 + +# check_PROGRAMS+=Cluster_child +# Cluster_child_SOURCES=Cluster_child.cpp Cluster.h +# Cluster_child_LDADD=$(lib_cluster) -lboost_test_exec_monitor + +# # 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 + +# endif |