ia64/xen-unstable

changeset 6384:c51562192ef6

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>
author cl349@firebug.cl.cam.ac.uk
date Tue Aug 23 19:57:32 2005 +0000 (2005-08-23)
parents 00071566ed1e
children f34e732ed4bf
files tools/xenstore/testsuite/test.sh
line diff
     1.1 --- a/tools/xenstore/testsuite/test.sh	Tue Aug 23 19:52:13 2005 +0000
     1.2 +++ b/tools/xenstore/testsuite/test.sh	Tue Aug 23 19:57:32 2005 +0000
     1.3 @@ -8,7 +8,7 @@ run_test()
     1.4      rm -rf $XENSTORED_ROOTDIR
     1.5      mkdir $XENSTORED_ROOTDIR
     1.6      if [ $VALGRIND -eq 1 ]; then
     1.7 -	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 &
     1.8 +	valgrind --suppressions=testsuite/vg-suppressions -q ./xenstored_test --output-pid --trace-file=testsuite/tmp/trace --no-fork > /tmp/pid 2> testsuite/tmp/xenstored_errors &
     1.9  	while [ ! -s /tmp/pid ]; do sleep 0; done
    1.10  	PID=`cat /tmp/pid`
    1.11  	rm /tmp/pid
    1.12 @@ -17,10 +17,10 @@ run_test()
    1.13  	PID=`./xenstored_test --output-pid --trace-file=testsuite/tmp/trace`
    1.14      fi
    1.15      if ./xs_test $2 $1; then
    1.16 -	if [ -s testsuite/tmp/vgout ]; then
    1.17 +	if [ -s testsuite/tmp/xenstored_errors ]; then
    1.18  	    kill $PID
    1.19 -	    echo VALGRIND errors:
    1.20 -	    cat testsuite/tmp/vgout
    1.21 +	    echo Errors:
    1.22 +	    cat testsuite/tmp/xenstored_errors
    1.23  	    return 1
    1.24  	fi
    1.25  	echo shutdown | ./xs_test