diff options
| author | Alan Conway <aconway@apache.org> | 2007-07-02 22:35:33 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-07-02 22:35:33 +0000 |
| commit | 83b4417af81df92cb640de1694488156ba29d85f (patch) | |
| tree | 630449e321fb571476080b737febd841e605ff2d /cpp/src/tests/cluster.mk | |
| parent | a36bef1975b1d273a65dd0e74994106fbaad4389 (diff) | |
| download | qpid-python-83b4417af81df92cb640de1694488156ba29d85f.tar.gz | |
2007-06-30 <aconway@redhat.com>
* src/qpid/cluster/Cluster.cpp: Refactor - expose 4 handler points
for all traffic to/from cluster. Removed HandlerUpdater functionality,
separate class. Cluster only deals with membership and connecting
the 4 handler points to CPG multicast.
* src/tests/cluster.mk: Dropped newgrp ais wrapper scripts, its
much simpler if the user just does "newgrp ais" before building.
* src/tests/ais_check: Test script to check if users gid is ais
and give clear notice if not.
* src/tests/Cluster.cpp: Updated for changes to Cluster.
* src/qpid/cluster/Cpg.cpp: Better messages for common errors.
* Handler.h: Remove nextHandler() minor convenience is outweighted
by risk of undetected errors if handlers that expect next() to be
set are called when it's not set.
* src/qpid/cluster/Cpg.cpp: Added logging. Replaced boost::function
with traditional virtual interface (nasty stack traces.)
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@552614 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/cluster.mk')
| -rw-r--r-- | cpp/src/tests/cluster.mk | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/cpp/src/tests/cluster.mk b/cpp/src/tests/cluster.mk index 6f59b13107..33e1569d3c 100644 --- a/cpp/src/tests/cluster.mk +++ b/cpp/src/tests/cluster.mk @@ -5,33 +5,25 @@ if CLUSTER lib_cluster = $(abs_builddir)/../libqpidcluster.la # NOTE: Programs using the openais library must be run with gid=ais -# Such programs are built as *.ais, with a wrapper script *.sh that -# runs the program with newgrp ais. +# You should do "newgrp ais" before running the tests to run these. # -# Rule to generate wrapper scripts for tests that require gid=ais. -run_test="env VALGRIND=$(VALGRIND) srcdir=$(srcdir) $(srcdir)/run_test" -.ais.sh: - echo "if groups | grep '\bais\b' >/dev/null;" > $@_t - echo "then echo $(run_test) ./$< \"$$@ \"| newgrp ais;" >>$@_t - echo "else echo WARNING: `whoami` not in group ais, skipping $<.;" >>$@_t - echo "fi" >> $@_t - mv $@_t $@ - chmod a+x $@ - # # Cluster tests. # -check_PROGRAMS+=Cpg.ais -Cpg_ais_SOURCES=Cpg.cpp -Cpg_ais_LDADD=$(lib_cluster) -lboost_unit_test_framework -unit_wrappers+=Cpg.sh - -# FIXME aconway 2007-06-29: Fixing problems with the test. -# check_PROGRAMS+=Cluster.ais -# Cluster_ais_SOURCES=Cluster.cpp Cluster.h -# Cluster_ais_LDADD=$(lib_cluster) -lboost_unit_test_framework -# unit_wrappers+=Cluster.sh + +TESTS+=ais_check +EXTRA_DIST+=ais_check + +TESTS+=Cpg +check_PROGRAMS+=Cpg +Cpg_SOURCES=Cpg.cpp +Cpg_LDADD=$(lib_cluster) -lboost_unit_test_framework + +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 |