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/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/Makefile.am') diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 8c904f6aff..1235c4d7fa 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -162,7 +162,8 @@ libqpidcommon_la_SOURCES = \ qpid/QpidError.cpp \ qpid/sys/Runnable.cpp \ qpid/sys/ProducerConsumer.cpp \ - qpid/CommonOptions.cpp \ + qpid/Options.cpp \ + qpid/Options.h \ qpid/log/Options.cpp \ qpid/log/Options.h \ qpid/log/Selector.cpp \ @@ -368,8 +369,7 @@ nobase_include_HEADERS = \ qpid/ExceptionHolder.h \ qpid/QpidError.h \ qpid/SharedObject.h \ - qpid/shared_ptr.h \ - qpid/CommonOptions.h + qpid/shared_ptr.h # Force build of qpidd during dist phase so help2man will work. dist-hook: qpidd -- cgit v1.2.1