diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-24 21:04:14 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-24 21:04:14 +0000 |
| commit | 412eb79670cb53fa48107dfb0d53488378b2d835 (patch) | |
| tree | 9496c3073834e04803bc2af83f449585b0587656 /qpid/cpp/src/tests | |
| parent | bf3d29992373c4c0c02acb1be3e83918a0f0e9e0 (diff) | |
| download | qpid-python-412eb79670cb53fa48107dfb0d53488378b2d835.tar.gz | |
* 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
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/run-unit-tests | 4 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/test_env | 4 |
2 files changed, 4 insertions, 4 deletions
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" |