On Fri, Jun 15, 2018 at 03:37:14PM -0600, Rob Herring wrote: > 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 <robh@xxxxxxxxxx> Applied, thanks. > --- > 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 76ded15c2d58..731959763fd1 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 -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
