diff options
| author | Alan Conway <aconway@apache.org> | 2007-07-19 22:20:12 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-07-19 22:20:12 +0000 |
| commit | 4758a90e01364c932f305283f56a7a885a5b976f (patch) | |
| tree | c99a1c2c5981e052b60aede6da6ef014266ba7c0 /qpid/cpp | |
| parent | 3abc57827f2e21dcfeb751056d58143e12399c1a (diff) | |
| download | qpid-python-4758a90e01364c932f305283f56a7a885a5b976f.tar.gz | |
* src/tests/start_broker, stop_broker:
- Fix bug: tripping over old log files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@557793 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rwxr-xr-x | qpid/cpp/src/tests/start_broker | 1 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/stop_broker | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/start_broker b/qpid/cpp/src/tests/start_broker index cd1ee07901..aa485ddd3e 100755 --- a/qpid/cpp/src/tests/start_broker +++ b/qpid/cpp/src/tests/start_broker @@ -1,3 +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 diff --git a/qpid/cpp/src/tests/stop_broker b/qpid/cpp/src/tests/stop_broker index bc26657d18..ef2f8362f5 100755 --- a/qpid/cpp/src/tests/stop_broker +++ b/qpid/cpp/src/tests/stop_broker @@ -1,7 +1,6 @@ #!/bin/sh # Stop the broker, check for errors. # -source `dirname $0`/vg_check export QPID_PORT=`cat qpidd.port` rm -f qpidd.port @@ -16,6 +15,9 @@ egrep 'warn|error|critical' qpidd.log && { } # Check valgrind log. -vg_check qpidd.vglog +if test -n "$VALGRIND"; then + source `dirname $0`/vg_check + vg_check qpidd.vglog +fi exit $ERROR |