From cfe3751fa315c911fe54e1bdf3a6ddc12e64df5b Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Mon, 30 Jul 2007 19:31:06 +0200 Subject: [PATCH] updated test.sh for nobug compatibility, has still problems with joined stderr and stdout --- tests/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test.sh b/tests/test.sh index b155869..c27d0b1 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -84,13 +84,13 @@ function TEST() esac TESTCNT=$(($TESTCNT + 1)) - if $valgrind $TESTBIN "$@" 2>&1 | tee ,tmp | grep -v 'debug:' | cmp ,cmp - &>/dev/null; then + if $valgrind $TESTBIN "$@" 2>&1 | tee ,tmp | grep -v ': \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\):' | cmp ,cmp - &>/dev/null; then echo ".. OK$MSGOK" echo ".. OK$MSGOK" >>,testlog else echo ".. FAILED$MSGFAIL"; echo ".. FAILED$MSGFAIL" >>,testlog - grep -v 'DEBUG:' <,tmp >,out + grep -v ': \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\):' <,tmp >,out diff -ua ,cmp ,out >>,testlog # grep 'DEBUG:\|==.*==' <,tmp >>,testlog cat ,tmp >>,testlog -- 2.11.4.GIT