From 5b1a6a15fe699a31067417c9dc77ddeb4eaed130 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Jan 2009 15:44:42 +0000 Subject: Additional latency measurement points. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@736326 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/.valgrind.supp | 8 ++++++++ qpid/cpp/src/tests/run_test | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/.valgrind.supp b/qpid/cpp/src/tests/.valgrind.supp index 7ae2bd9845..9984c18151 100644 --- a/qpid/cpp/src/tests/.valgrind.supp +++ b/qpid/cpp/src/tests/.valgrind.supp @@ -1,3 +1,11 @@ +{ + Benign leak in CPG - patched version. + Memcheck:Leak + fun:* + fun:openais_service_connect + fun:cpg_initialize +} + { Benign error in libcpg. Memcheck:Param diff --git a/qpid/cpp/src/tests/run_test b/qpid/cpp/src/tests/run_test index 062e9e137e..82be3b0893 100755 --- a/qpid/cpp/src/tests/run_test +++ b/qpid/cpp/src/tests/run_test @@ -24,7 +24,7 @@ # Output nothing if test passes, show the output if it fails and # leave output in .log for examination. # -# If qpidd.port exists run test with QPID_PORT=`cat qpidd.port` +# If qpidd.port exists and is not empty run test with QPID_PORT=`cat qpidd.port` # # If $VALGRIND if is set run under valgrind. If there are valgrind # erros show valgrind output, also leave it in .valgrind for @@ -38,7 +38,7 @@ srcdir=`dirname $0` export VALGRIND srcdir # Set QPID_PORT if qpidd.port exists. -test -f qpidd.port && QPID_PORT=`cat qpidd.port` +test -s qpidd.port && QPID_PORT=`cat qpidd.port` export QPID_PORT # Avoid silly libtool error messages if these are not defined -- cgit v1.2.1