Rusty Russell
2005-Aug-21 06:50 UTC
[Xen-devel] [PATCH] Fix xenstore testsuite for valgrind 3.0, latest Debian glibc
Debian upgrade revealed two problems: glibc spits out a warning on every
binary, and valgrind 3.0 gratuitously changed --logfile-fd to --log-fd,
so don''t use it.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
# HG changeset patch
# User Rusty Russell <rusty@rustcorp.com.au>
# Node ID 68ace2715cbc988c27c494a44a3154dbfcf83d0e
# Parent 46e43646cd1693ea44f5290d1cc63caa6d368fbc
Valgrind 3.0 changed --log-file-fd to --log-fd, breaking this; don''t
use either.
Glibc currently in Debian causes spurious errors: insert suppression.
diff -r 46e43646cd16 -r 68ace2715cbc tools/xenstore/testsuite/test.sh
--- a/tools/xenstore/testsuite/test.sh Fri Aug 19 20:02:01 2005
+++ b/tools/xenstore/testsuite/test.sh Sat Aug 20 05:53:26 2005
@@ -8,7 +8,7 @@
rm -rf $XENSTORED_ROOTDIR
mkdir $XENSTORED_ROOTDIR
if [ $VALGRIND -eq 1 ]; then
- valgrind -q --logfile-fd=3 ./xenstored_test --output-pid
--trace-file=testsuite/tmp/trace --no-fork 3>testsuite/tmp/vgout >
/tmp/pid 2> testsuite/tmp/xenstored_errors &
+ valgrind --suppressions=testsuite/vg-suppressions -q ./xenstored_test
--output-pid --trace-file=testsuite/tmp/trace --no-fork > /tmp/pid 2>
testsuite/tmp/xenstored_errors &
while [ ! -s /tmp/pid ]; do sleep 0; done
PID=`cat /tmp/pid`
rm /tmp/pid
@@ -17,10 +17,10 @@
PID=`./xenstored_test --output-pid --trace-file=testsuite/tmp/trace`
fi
if ./xs_test $2 $1; then
- if [ -s testsuite/tmp/vgout ]; then
+ if [ -s testsuite/tmp/xenstored_errors ]; then
kill $PID
- echo VALGRIND errors:
- cat testsuite/tmp/vgout
+ echo Errors:
+ cat testsuite/tmp/xenstored_errors
return 1
fi
echo shutdown | ./xs_test
diff -r 46e43646cd16 -r 68ace2715cbc tools/xenstore/testsuite/vg-suppressions
--- /dev/null Fri Aug 19 20:02:01 2005
+++ b/tools/xenstore/testsuite/vg-suppressions Sat Aug 20 05:53:26 2005
@@ -0,0 +1,9 @@
+{
+ Glibc goes boom from _start (Debian glibc 2.3.5-3)
+ Memcheck:Cond
+ obj:/lib/ld-2.3.5.so
+ obj:/lib/ld-2.3.5.so
+ obj:/lib/ld-2.3.5.so
+ obj:/lib/ld-2.3.5.so
+ obj:/lib/ld-2.3.5.so
+}
--
A bad analogy is like a leaky screwdriver -- Richard Braakman
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Christian Limpach
2005-Aug-23 19:57 UTC
Re: [Xen-devel] [PATCH] Fix xenstore testsuite for valgrind 3.0, latest Debian glibc
Thanks! On 8/21/05, Rusty Russell <rusty@rustcorp.com.au> wrote:> Debian upgrade revealed two problems: glibc spits out a warning on every > binary, and valgrind 3.0 gratuitously changed --logfile-fd to --log-fd, > so don''t use it. > > Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> > > # HG changeset patch > # User Rusty Russell <rusty@rustcorp.com.au> > # Node ID 68ace2715cbc988c27c494a44a3154dbfcf83d0e > # Parent 46e43646cd1693ea44f5290d1cc63caa6d368fbc > Valgrind 3.0 changed --log-file-fd to --log-fd, breaking this; don''t use either. > Glibc currently in Debian causes spurious errors: insert suppression. > > diff -r 46e43646cd16 -r 68ace2715cbc tools/xenstore/testsuite/test.sh > --- a/tools/xenstore/testsuite/test.sh Fri Aug 19 20:02:01 2005 > +++ b/tools/xenstore/testsuite/test.sh Sat Aug 20 05:53:26 2005 > @@ -8,7 +8,7 @@ > rm -rf $XENSTORED_ROOTDIR > mkdir $XENSTORED_ROOTDIR > if [ $VALGRIND -eq 1 ]; then > - valgrind -q --logfile-fd=3 ./xenstored_test --output-pid --trace-file=testsuite/tmp/trace --no-fork 3>testsuite/tmp/vgout > /tmp/pid 2> testsuite/tmp/xenstored_errors & > + valgrind --suppressions=testsuite/vg-suppressions -q ./xenstored_test --output-pid --trace-file=testsuite/tmp/trace --no-fork > /tmp/pid 2> testsuite/tmp/xenstored_errors & > while [ ! -s /tmp/pid ]; do sleep 0; done > PID=`cat /tmp/pid` > rm /tmp/pid > @@ -17,10 +17,10 @@ > PID=`./xenstored_test --output-pid --trace-file=testsuite/tmp/trace` > fi > if ./xs_test $2 $1; then > - if [ -s testsuite/tmp/vgout ]; then > + if [ -s testsuite/tmp/xenstored_errors ]; then > kill $PID > - echo VALGRIND errors: > - cat testsuite/tmp/vgout > + echo Errors: > + cat testsuite/tmp/xenstored_errors > return 1 > fi > echo shutdown | ./xs_test > diff -r 46e43646cd16 -r 68ace2715cbc tools/xenstore/testsuite/vg-suppressions > --- /dev/null Fri Aug 19 20:02:01 2005 > +++ b/tools/xenstore/testsuite/vg-suppressions Sat Aug 20 05:53:26 2005 > @@ -0,0 +1,9 @@ > +{ > + Glibc goes boom from _start (Debian glibc 2.3.5-3) > + Memcheck:Cond > + obj:/lib/ld-2.3.5.so > + obj:/lib/ld-2.3.5.so > + obj:/lib/ld-2.3.5.so > + obj:/lib/ld-2.3.5.so > + obj:/lib/ld-2.3.5.so > +} > > -- > A bad analogy is like a leaky screwdriver -- Richard Braakman > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel