From a75b83544454810f6d30f057cdea5f0d961b1b31 Mon Sep 17 00:00:00 2001 From: "Paulo Alcantara (SUSE)" Date: Mon, 16 Mar 2020 22:54:39 -0300 Subject: [PATCH] generic/310: slightly improve check for dmesg error The 'grep -c "error"' check was causing false positive results for cifs.ko when running it with 'echo 1 > /proc/fs/cifs/cifsFYI'. That is, the test would fail when cifs.ko prints out a non-error message like this: [ 2320.903987] fs/cifs/smb2maperror.c: Mapping SMB2 status code 0x80000006 to POSIX err -61 Signed-off-by: Paulo Alcantara (SUSE) Suggested-by: Zorro Lang Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/generic/310 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/generic/310 b/tests/generic/310 index 1fcd517e..74bb04d6 100755 --- a/tests/generic/310 +++ b/tests/generic/310 @@ -49,7 +49,7 @@ _require_command "$KILLALL_PROG" killall dmesg -c > /dev/null nr_bug=`dmesg | grep -c "kernel BUG"` -nr_error=`dmesg | grep -c "error"` +nr_error=`dmesg | grep -wc "error"` nr_null=`dmesg | grep -c "kernel NULL pointer dereference"` nr_warning=`dmesg | grep -c "^WARNING"` nr_lockdep=`dmesg | grep -c "possible recursive locking detected"` @@ -58,7 +58,7 @@ nr_lockdep=`dmesg | grep -c "possible recursive locking detected"` check_kernel_bug() { new_bug=`dmesg | grep -c "kernel BUG"` - new_error=`dmesg | grep -c "error"` + new_error=`dmesg | grep -wc "error"` new_null=`dmesg | grep -c "kernel NULL pointer dereference"` new_warning=`dmesg | grep -c "^WARNING"` new_lockdep=`dmesg | grep -c "possible recursive locking detected"` -- 2.39.5