Author: aconway
Date: Wed Jun 4 08:08:13 2008
New Revision: 663158
URL: http://svn.apache.org/viewvc?rev=663158&view=rev
Log:
Avoid use of valgrind --log-file-exactly flag, removed in valgrind 3.3
Modified:
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/run_test
incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=663158&r1=663157&r2=663158&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed Jun 4 08:08:13 2008
@@ -143,7 +143,7 @@
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.
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/run_test
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/run_test?rev=663158&r1=663157&r2=663158&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/run_test (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/run_test Wed Jun 4 08:08:13 2008
@@ -31,14 +31,14 @@
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 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/start_broker?rev=663158&r1=663157&r2=663158&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/start_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/start_broker Wed Jun 4 08:08:13
2008
@@ -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
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker?rev=663158&r1=663157&r2=663158&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker Wed Jun 4 08:08:13 2008
@@ -13,8 +13,8 @@
# 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
