diff options
| author | Alan Conway <aconway@apache.org> | 2008-06-04 15:08:13 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-06-04 15:08:13 +0000 |
| commit | 7610aec25ece167833b206a6866c5a5ade2aaee1 (patch) | |
| tree | b61f6e4a991fb7d7eb79d37099a71a339b21278b /cpp/src | |
| parent | 6e85af362ab497f7be4912c3cbeb93f9451322e2 (diff) | |
| download | qpid-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')
| -rw-r--r-- | cpp/src/tests/Makefile.am | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/run_test | 8 | ||||
| -rwxr-xr-x | cpp/src/tests/start_broker | 4 | ||||
| -rwxr-xr-x | cpp/src/tests/stop_broker | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 9b31b1c91a..b53176ebd1 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -143,7 +143,7 @@ check_LTLIBRARIES += libdlclose_noop.la libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir) libdlclose_noop_la_SOURCES = dlclose_noop.c -CLEANFILES+=valgrind.out *.log *.vglog dummy_test $(unit_wrappers) +CLEANFILES+=valgrind.out *.log *.vglog* dummy_test $(unit_wrappers) # FIXME aconway 2008-05-23: Disabled interop_runner because it uses # the obsolete Channel class. Convert to Session and re-enable. 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 diff --git a/cpp/src/tests/start_broker b/cpp/src/tests/start_broker index be5a1b00e4..e579ff586c 100755 --- a/cpp/src/tests/start_broker +++ b/cpp/src/tests/start_broker @@ -1,4 +1,4 @@ #!/bin/sh -rm -f qpidd.vglog qpidd.log -test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --" +rm -f qpidd.vglog* qpidd.log +test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=qpidd.vglog --" exec libtool --mode=execute $VALGRIND ../qpidd --auth no --no-module-dir --daemon --port 0 --log-output qpidd.log "$@" > qpidd.port diff --git a/cpp/src/tests/stop_broker b/cpp/src/tests/stop_broker index e141ef9841..9b3ef5db5b 100755 --- a/cpp/src/tests/stop_broker +++ b/cpp/src/tests/stop_broker @@ -13,8 +13,8 @@ grep -a 'warning\|error\|critical' qpidd.log && { # Check valgrind log. if test -n "$VALGRIND"; then - source `dirname $0`/vg_check - vg_check qpidd.vglog + source `dirname $0`/vg_check $VG_LOG* + vg_check qpidd.vglog* fi exit $ERROR |