From 83b4417af81df92cb640de1694488156ba29d85f Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 2 Jul 2007 22:35:33 +0000
Subject: 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
---
 cpp/src/tests/Makefile.am | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'cpp/src/tests/Makefile.am')

diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 3303afa0be..5a8ad1bde6 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -11,17 +11,19 @@ lib_broker = $(abs_builddir)/../libqpidbroker.la
 # Initialize variables that are incremented with +=
 # 
 check_PROGRAMS=
-unit_progs=
-unit_wrappers=
+TESTS=
+EXTRA_DIST=
 
 #
 # Unit test programs.
 # 
-unit_progs+=logging
+TESTS+=logging
+check_PROGRAMS+=logging
 logging_SOURCES=logging.cpp test_tools.h
 logging_LDADD=-lboost_unit_test_framework -lboost_regex $(lib_common) 
 
-unit_progs+=Url
+TESTS+=Url
+check_PROGRAMS+=Url
 Url_SOURCES=Url.cpp test_tools.h
 Url_LDADD=-lboost_unit_test_framework $(lib_common) 
 
@@ -76,21 +78,20 @@ unit_tests =		\
 
 # Executables for client tests
 
-testprogs =		\
+testprogs=		\
   client_test		\
   echo_service		\
   topic_listener	\
-  topic_publisher
-
-
-check_PROGRAMS += $(unit_progs) $(testprogs) interop_runner 
+  topic_publisher	\
+  interop_runner 
+check_PROGRAMS += $(testprogs)
 
 TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) $(srcdir)/run_test
 
 system_tests = client_test quick_topictest
-TESTS = dummy_test $(unit_progs) $(unit_wrappers) run-unit-tests start_broker $(system_tests) python_tests kill_broker 
+TESTS += run-unit-tests start_broker $(system_tests) python_tests kill_broker 
 
-EXTRA_DIST =								\
+EXTRA_DIST +=								\
   test_env run_test							\
   run-unit-tests start_broker python_tests kill_broker 			\
   quick_topictest							\
@@ -131,10 +132,8 @@ gen.mk: Makefile.am
 check-unit:
 	$(MAKE) check TESTS=$(UNIT_TESTS) run-unit-tests
 
-# Dummy test to force necessary test files to be generated.
-dummy_test: .valgrind.supp .valgrindrc
-	{ echo "#!/bin/sh";  echo "# Dummy test, does nothing. "; } > $@
-	chmod a+x $@
+# Make sure valgrind files are generated.
+all: .valgrind.supp .valgrindrc
 
 # Create a copy so that can be modified without risk of committing the changes.
 .valgrindrc: .valgrindrc-default
-- 
cgit v1.2.1