diff options
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/logging.cpp | 48 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/quick_perftest | 2 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/start_broker | 2 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/start_cluster | 2 |
4 files changed, 27 insertions, 27 deletions
diff --git a/qpid/cpp/src/tests/logging.cpp b/qpid/cpp/src/tests/logging.cpp index a4e131ec57..72262ab3bc 100644 --- a/qpid/cpp/src/tests/logging.cpp +++ b/qpid/cpp/src/tests/logging.cpp @@ -264,15 +264,15 @@ Statement statement( BOOST_AUTO_TEST_CASE(testOptionsParse) { char* argv[]={ 0, - "--log.enable", "error+:foo", - "--log.enable", "debug:bar", - "--log.enable", "info", - "--log.output", "x", - "--log.output", "y", - "--log.level", "yes", - "--log.source", "1", - "--log.thread", "true", - "--log.function", "YES" + "--log-enable", "error+:foo", + "--log-enable", "debug:bar", + "--log-enable", "info", + "--log-output", "x", + "--log-output", "y", + "--log-level", "yes", + "--log-source", "1", + "--log-thread", "true", + "--log-function", "YES" }; qpid::log::Options opts; opts.parse(ARGC(argv), argv); @@ -299,9 +299,9 @@ BOOST_AUTO_TEST_CASE(testOptionsDefault) { BOOST_AUTO_TEST_CASE(testSelectorFromOptions) { char* argv[]={ 0, - "--log.enable", "error+:foo", - "--log.enable", "debug:bar", - "--log.enable", "info" + "--log-enable", "error+:foo", + "--log-enable", "debug:bar", + "--log-enable", "info" }; qpid::log::Options opts; opts.parse(ARGC(argv), argv); @@ -322,10 +322,10 @@ BOOST_AUTO_TEST_CASE(testOptionsFormat) { BOOST_CHECK_EQUAL(Logger::TIME|Logger::LEVEL, l.format(opts)); char* argv[]={ 0, - "--log.time", "no", - "--log.level", "no", - "--log.source", "1", - "--log.thread", "1" + "--log-time", "no", + "--log-level", "no", + "--log-source", "1", + "--log-thread", "1" }; opts.parse(ARGC(argv), argv); BOOST_CHECK_EQUAL( @@ -335,10 +335,10 @@ BOOST_AUTO_TEST_CASE(testOptionsFormat) { Options opts; // Clear. char* argv[]={ 0, - "--log.level", "no", - "--log.thread", "true", - "--log.function", "YES", - "--log.time", "YES" + "--log-level", "no", + "--log-thread", "true", + "--log-function", "YES", + "--log-time", "YES" }; opts.parse(ARGC(argv), argv); BOOST_CHECK_EQUAL( @@ -353,10 +353,10 @@ BOOST_AUTO_TEST_CASE(testLoggerConfigure) { Options opts; char* argv[]={ 0, - "--log.time", "no", - "--log.source", "yes", - "--log.output", "logging.tmp", - "--log.enable", "critical" + "--log-time", "no", + "--log-source", "yes", + "--log-output", "logging.tmp", + "--log-enable", "critical" }; opts.parse(ARGC(argv), argv); l.configure(opts, "test"); diff --git a/qpid/cpp/src/tests/quick_perftest b/qpid/cpp/src/tests/quick_perftest index 085d2b2e81..9108d58a71 100755 --- a/qpid/cpp/src/tests/quick_perftest +++ b/qpid/cpp/src/tests/quick_perftest @@ -1,2 +1,2 @@ #!/bin/sh -exec `dirname $0`/run_test ./perftest --listen --publish --count 1000 +exec `dirname $0`/run_test ./perftest --count 1000 diff --git a/qpid/cpp/src/tests/start_broker b/qpid/cpp/src/tests/start_broker index 6f5752befb..0d4352644b 100755 --- a/qpid/cpp/src/tests/start_broker +++ b/qpid/cpp/src/tests/start_broker @@ -1,4 +1,4 @@ #!/bin/sh rm -f qpidd.vglog qpidd.log test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --" -exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log.output qpidd.log "$@" > qpidd.port +exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log-output qpidd.log "$@" > qpidd.port diff --git a/qpid/cpp/src/tests/start_cluster b/qpid/cpp/src/tests/start_cluster index 8f44854978..5992a75d8d 100755 --- a/qpid/cpp/src/tests/start_cluster +++ b/qpid/cpp/src/tests/start_cluster @@ -12,7 +12,7 @@ shift OPTS=$* CLUSTER=`whoami` # Cluster name=user name, avoid clashes. for (( i=0; i<SIZE; ++i )); do - PORT=`../qpidd -dp0 --log.output=cluster$i.log --cluster $CLUSTER $OPTS` || exit 1 + PORT=`../qpidd -dp0 --log-output=cluster$i.log --cluster $CLUSTER $OPTS` || exit 1 echo $PORT >> cluster.ports done |