summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-01-21 15:44:42 +0000
committerAlan Conway <aconway@apache.org>2009-01-21 15:44:42 +0000
commit5b1a6a15fe699a31067417c9dc77ddeb4eaed130 (patch)
tree0e7ca1f391fd8dd3222d5892c8c0ab1799303c72 /qpid/cpp/src/tests
parente250b40883674b0cced43bcdece5f7fde3dabae1 (diff)
downloadqpid-python-5b1a6a15fe699a31067417c9dc77ddeb4eaed130.tar.gz
Additional latency measurement points.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@736326 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
-rw-r--r--qpid/cpp/src/tests/.valgrind.supp8
-rwxr-xr-xqpid/cpp/src/tests/run_test4
2 files changed, 10 insertions, 2 deletions
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,4 +1,12 @@
{
+ Benign leak in CPG - patched version.
+ Memcheck:Leak
+ fun:*
+ fun:openais_service_connect
+ fun:cpg_initialize
+}
+
+{
Benign error in libcpg.
Memcheck:Param
socketcall.sendmsg(msg.msg_iov[i])
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 <test>.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 <test>.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