diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/src/tests/start_broker | 1 | ||||
| -rwxr-xr-x | cpp/src/tests/stop_broker | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/tests/start_broker b/cpp/src/tests/start_broker index cd1ee07901..aa485ddd3e 100755 --- a/cpp/src/tests/start_broker +++ b/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/cpp/src/tests/stop_broker b/cpp/src/tests/stop_broker index bc26657d18..ef2f8362f5 100755 --- a/cpp/src/tests/stop_broker +++ b/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 |