diff options
| author | Alan Conway <aconway@apache.org> | 2007-05-30 16:13:58 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-05-30 16:13:58 +0000 |
| commit | 1d63a898503d20e3221be43fc222f0091971a0ce (patch) | |
| tree | 78d8673b9ed8820e431b6a6f353ba0143adeb800 /cpp/src/tests/start_broker | |
| parent | f2b034ea3f4fa70e512fafdf18fd42c370194329 (diff) | |
| download | qpid-python-1d63a898503d20e3221be43fc222f0091971a0ce.tar.gz | |
Logging infrastructure: See qpidd --long-help for details.
* src/qpid/log/*: Logging infrastructure, QPID_LOG macro.
* src/*: changed output to cout/cerr to logging.
* src/qpidd.cpp: logging options.
* src/tests/Makefile.am: fixed issues with valgrind
* src/tests/kill|start_broker: use broker daemon options.
* src/tests/run_test: run tests in valgrind. Disabled till leaks in
client_test are fixed.
* src/test/unit/logging.cpp: Logging unit test using boost test framework.
Eventually we should move all unit tests to boost & drop CppUnit.
* src/test/unit/test_tools.h: useful extensions to boost framework:
Regular expression check, ostream << for vectors.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@542855 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/start_broker')
| -rwxr-xr-x | cpp/src/tests/start_broker | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/cpp/src/tests/start_broker b/cpp/src/tests/start_broker index dfbaee6bcc..515a3a2b5e 100755 --- a/cpp/src/tests/start_broker +++ b/cpp/src/tests/start_broker @@ -1,14 +1,5 @@ #!/bin/sh -set -e - -LOG=`pwd`/qpidd.log -PID=`pwd`/qpidd.pid - -rm -rf $LOG $PID - -# Start the daemon, recording its PID. -../qpidd > $LOG 2>&1 & echo $! > $PID - -# FIXME aconway 2007-01-18: qpidd should not return till it is accepting -# connections, remove arbitrary sleep. -sleep 30 +fail() { echo FAIL: $0:$* 1>&2; exit 1; } +qpidd=../qpidd +PID=`$qpidd --check --ppid` && fail $qpidd already running $PID +$qpidd --log.output qpidd.log --daemon || fail $qpidd startup: `cat qpidd.log` |