From 69520adb359ca50918c802611e300887bcfd5bea Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 6 Dec 2006 08:11:57 +0000 Subject: Patch sumbitted to qpid-dev: 2006-12-05 Jim Meyering Improve --help output. Add --version option. * lib/broker/Configuration.cpp: Include . (Configuration::Configuration): Use the active voice. Handle --version. (Configuration::usage): Add Usage:... and bug-reporting address. Output short+long options like "-o, --option ...", so that help2man will format them properly. * lib/broker/Configuration.h: (class Configuration) [version, programName]: New members. (parse): Update prototype. (isVersion, setValue): New prototypes. * src/qpidd.cpp: Include . (programName): New file-scoped global. (handle_signal, main): Emit diagnostics to stderr. (main): Pass program name to config.parse. (main): Handle new --version option. Also updated ConfigurationTest to use the modified parse() method. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@482958 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/tests/ConfigurationTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'qpid/cpp/tests/ConfigurationTest.cpp') diff --git a/qpid/cpp/tests/ConfigurationTest.cpp b/qpid/cpp/tests/ConfigurationTest.cpp index 2b308f45cf..c2c8eb6f32 100644 --- a/qpid/cpp/tests/ConfigurationTest.cpp +++ b/qpid/cpp/tests/ConfigurationTest.cpp @@ -41,7 +41,7 @@ class ConfigurationTest : public CppUnit::TestCase { Configuration conf; char* argv[] = {"ignore", "--help"}; - conf.parse(2, argv); + conf.parse("ignore", 2, argv); CPPUNIT_ASSERT(conf.isHelp()); } @@ -49,7 +49,7 @@ class ConfigurationTest : public CppUnit::TestCase { Configuration conf; char* argv[] = {"ignore", "--port", "6789"}; - conf.parse(3, argv); + conf.parse("ignore", 3, argv); CPPUNIT_ASSERT_EQUAL(6789, conf.getPort()); } @@ -57,7 +57,7 @@ class ConfigurationTest : public CppUnit::TestCase { Configuration conf; char* argv[] = {"ignore", "-p", "6789"}; - conf.parse(3, argv); + conf.parse("ignore", 3, argv); CPPUNIT_ASSERT_EQUAL(6789, conf.getPort()); } @@ -65,7 +65,7 @@ class ConfigurationTest : public CppUnit::TestCase { Configuration conf; char* argv[] = {"ignore", "--store", "my-store-module.so"}; - conf.parse(3, argv); + conf.parse("ignore", 3, argv); std::string expected("my-store-module.so"); CPPUNIT_ASSERT_EQUAL(expected, conf.getStore()); } @@ -74,7 +74,7 @@ class ConfigurationTest : public CppUnit::TestCase { Configuration conf; char* argv[] = {"ignore", "-t", "--worker-threads", "10"}; - conf.parse(4, argv); + conf.parse("ignore", 4, argv); CPPUNIT_ASSERT_EQUAL(5672, conf.getPort());//default CPPUNIT_ASSERT_EQUAL(10, conf.getWorkerThreads()); CPPUNIT_ASSERT(conf.isTrace()); -- cgit v1.2.1