summaryrefslogtreecommitdiff
path: root/cpp/src/tests/run_test
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-07-19 17:09:09 +0000
committerAlan Conway <aconway@apache.org>2007-07-19 17:09:09 +0000
commit0cd558081d98905c9bead280345a65613267bf4f (patch)
tree11c35f2b13f8a5e35dad707d7915f427961d2b67 /cpp/src/tests/run_test
parentdb3d885edacb4508ec19f0d6380b6de618cc8643 (diff)
downloadqpid-python-0cd558081d98905c9bead280345a65613267bf4f.tar.gz
* src/tests/start_broker, stop_broker: Use valgrind on broker.
* src/tests/run_test, vg_check: - factored valgrind check out of run_test for reuse in stop_broker. * src/tests/Makefile.am, stop_broker, README: - kill_broker renamed stop_broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@557692 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/run_test')
-rwxr-xr-xcpp/src/tests/run_test20
1 files changed, 1 insertions, 19 deletions
diff --git a/cpp/src/tests/run_test b/cpp/src/tests/run_test
index ec724fe727..d717cd2ace 100755
--- a/cpp/src/tests/run_test
+++ b/cpp/src/tests/run_test
@@ -12,26 +12,8 @@
# examination.
#
-vg_failed() {
- cat $VG_LOG 1>&2
- echo $1 1>&2
- exit 1
-}
+source `dirname $0`/vg_check
-vg_check()
-{
- test -f $VG_LOG || vg_failed Valgrind log file $VG_LOG missing.
- # Ensure there is an ERROR SUMMARY line.
- grep -E '^==[0-9]+== ERROR SUMMARY:' $VG_LOG > /dev/null || \
- vg_failed "No valgrind ERROR SUMMARY line in $$vg_failed."
- # Ensure that the number of errors is 0.
- grep -E '^==[0-9]+== ERROR SUMMARY: [^0]' $VG_LOG > /dev/null && \
- vg_failed "Valgrind reported errors in $vg_out; see above."
- # Check for leaks.
- grep -E '^==[0-9]+== +.* lost: [^0]' $VG_LOG && \
- vg_failed "Found memory leaks (see log file, $VG_LOG); see above."
- true
-}
# Export variables from makefile.
export VALGRIND srcdir