summaryrefslogtreecommitdiff
path: root/cpp/src/tests/run_test
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-06-04 15:08:13 +0000
committerAlan Conway <aconway@apache.org>2008-06-04 15:08:13 +0000
commit7610aec25ece167833b206a6866c5a5ade2aaee1 (patch)
treeb61f6e4a991fb7d7eb79d37099a71a339b21278b /cpp/src/tests/run_test
parent6e85af362ab497f7be4912c3cbeb93f9451322e2 (diff)
downloadqpid-python-7610aec25ece167833b206a6866c5a5ade2aaee1.tar.gz
Avoid use of valgrind --log-file-exactly flag, removed in valgrind 3.3
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@663158 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/run_test')
-rwxr-xr-xcpp/src/tests/run_test8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/tests/run_test b/cpp/src/tests/run_test
index 2280e96301..08bf845ba1 100755
--- a/cpp/src/tests/run_test
+++ b/cpp/src/tests/run_test
@@ -31,14 +31,14 @@ test -z "$LC_COLLATE" && export LC_COLLATE=
test -z "$LC_MESSAGES" && export LC_MESSAGES=
VG_LOG="$1.vglog"
-rm -f $VG_LOG
+rm -f $VG_LOG*
if grep -l "^# Generated by .*libtool" "$1" >/dev/null 2>&1; then
# This is a libtool "executable". Valgrind it if VALGRIND specified.
- test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=$VG_LOG --"
+ test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=$VG_LOG --"
# Hide output unless there's an error.
libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=$?
- test -n "$VALGRIND" && vg_check
+ test -n "$VALGRIND" && vg_check $VG_LOG*
else
# This is a non-libtool shell script, just execute it.
export VALGRIND srcdir
@@ -47,7 +47,7 @@ fi
if test -z "$ERROR"; then
# Clean up logs if there was no error.
- rm -f $VG_LOG
+ rm -f $VG_LOG*
exit 0
else
exit $ERROR