From d032f5584b0f1de890844a2796d6ba158b011fca Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 27 Jun 2007 00:12:26 +0000 Subject: Make check now starts a broker on a dynamically assigned port, so multiple qpid builds on one host will not conflict. * src/tests/run_test, start_broker, kill_broker: Broker writes port to file, run_test sets QPID_PORT in environment of all tests. * src/tests/topic_publisher.cpp, topic_listener.cpp, client_test.cpp: All test clients use TestOptions to parse options from args and env. * src/qpid/Options.h: Renamed from CommonOptions.h Simplified use of Options class. * src/qpid/Url.h: Renamed defaultPort constant. * src/tests/logging.cpp: * src/tests/interop_runner.cpp: * src/tests/TestOptions.h: * src/qpidd.cpp: * src/qpid/log/Options.cpp: * src/qpid/log/Logger.cpp: * src/qpid/broker/Broker.cpp: Updated for changes to Options. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@550993 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/tests/Makefile.am') diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 9b15b68c04..ebf1aa9f41 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -89,14 +89,14 @@ testprogs = \ check_PROGRAMS += $(unit_progs) $(testprogs) interop_runner -TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) ./run_test +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 daemon_test +TESTS = dummy_test $(unit_progs) $(unit_wrappers) run-unit-tests start_broker $(system_tests) python_tests kill_broker EXTRA_DIST = \ test_env run_test \ - run-unit-tests start_broker python_tests kill_broker daemon_test \ + run-unit-tests start_broker python_tests kill_broker \ quick_topictest \ topictest \ .valgrind.supp-default \ -- cgit v1.2.1