diff options
Diffstat (limited to 'cpp/src/tests')
| -rwxr-xr-x | cpp/src/tests/run-unit-tests | 4 | ||||
| -rwxr-xr-x | cpp/src/tests/test_env | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/tests/run-unit-tests b/cpp/src/tests/run-unit-tests index a3113b14ee..ce8f488b29 100755 --- a/cpp/src/tests/run-unit-tests +++ b/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/cpp/src/tests/test_env b/cpp/src/tests/test_env index c73cac43ea..3fdfaa8a88 100755 --- a/cpp/src/tests/test_env +++ b/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" |