From 412eb79670cb53fa48107dfb0d53488378b2d835 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 24 Aug 2007 21:04:14 +0000 Subject: * src/qpid/broker/Daemon.cpp: Additional logging. * configure.ac: Fixed problem with openais check. * src/tests/test_env: Remove LD_PRELOAD dlclose_noop, only for CppUnit. * src/tests/run-unit-tests: Added LD_PRELOAD dlclose_noop. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@569520 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/run-unit-tests | 4 +++- qpid/cpp/src/tests/test_env | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/run-unit-tests b/qpid/cpp/src/tests/run-unit-tests index a3113b14ee..ce8f488b29 100755 --- a/qpid/cpp/src/tests/run-unit-tests +++ b/qpid/cpp/src/tests/run-unit-tests @@ -22,5 +22,7 @@ done test -z "$TEST_ARGS" && TEST_ARGS=".libs/*Test.so" test -z "$srcdir" && srcdir=. -exec $srcdir/test_env DllPlugInTester -c -b $TEST_ARGS + +# libdlclose_noop prevents unloading symbols needed for valgrind output. +LD_PRELOAD=.libs/libdlclose_noop.so exec $srcdir/test_env DllPlugInTester -c -b $TEST_ARGS diff --git a/qpid/cpp/src/tests/test_env b/qpid/cpp/src/tests/test_env index c73cac43ea..3fdfaa8a88 100755 --- a/qpid/cpp/src/tests/test_env +++ b/qpid/cpp/src/tests/test_env @@ -34,10 +34,8 @@ vg_check() true } -# libdlclose_noop prevents unloading symbols needed for valgrind output. -preload=.libs/libdlclose_noop.so # Output to file, only display if there is an error. opts=--log-file-exactly=$vg_log -LD_PRELOAD=$preload libtool --mode=execute $VALGRIND $opts -- "$@" || fail=1 +libtool --mode=execute $VALGRIND $opts -- "$@" || fail=1 vg_check && test -z "$fail" -- cgit v1.2.1