From 9d78c33bf8a122eb3a97934e71b8c651cc1b1e4b Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 15 Jun 2018 15:37:14 -0600 Subject: [PATCH] tests: fix grep for checks error messages I noticed the error type passed in didn't matter for check tests to pass. There's a couple of problems with the grep regex. The error/warning messages begin with the output filename now, so "ERROR" or "Warning" is not at the beginning of the line. Secondly, the parentheses seem to be wrong. It's not clear to me what was intended. Signed-off-by: Rob Herring Signed-off-by: David Gibson --- tests/dtc-checkfails.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/dtc-checkfails.sh b/tests/dtc-checkfails.sh index 76ded15..7319597 100755 --- a/tests/dtc-checkfails.sh +++ b/tests/dtc-checkfails.sh @@ -30,13 +30,13 @@ ret="$?" FAIL_IF_SIGNAL $ret for c in $YESCHECKS; do - if ! grep -E "^(ERROR)|(Warning) \($c\):" $LOG > /dev/null; then + if ! grep -E "(ERROR|Warning) \($c\):" $LOG > /dev/null; then FAIL "Failed to trigger check \"$c\"" fi done for c in $NOCHECKS; do - if grep -E "^(ERROR)|(Warning) \($c\):" $LOG > /dev/null; then + if grep -E "(ERROR|Warning) \($c\):" $LOG > /dev/null; then FAIL "Incorrectly triggered check \"$c\"" fi done