From: cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Date: Tue, 23 Aug 2005 19:57:32 +0000 (+0000)
Subject: Fix xenstore testsuite for valgrind 3.0 and latest Debian glibc.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16867
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d37a48a45daddc10b80428ac8928da713d4865bf;p=xen.git

Fix xenstore testsuite for valgrind 3.0 and 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>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
---

diff --git a/tools/xenstore/testsuite/test.sh b/tools/xenstore/testsuite/test.sh
index c99e9ac6cd..077c843f5a 100755
--- a/tools/xenstore/testsuite/test.sh
+++ b/tools/xenstore/testsuite/test.sh
@@ -8,7 +8,7 @@ run_test()
     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 @@ run_test()
 	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