generic/310: slightly improve check for dmesg error

[xfstests-dev.git] / tests / generic / 310

diff --git a/tests/generic/310 b/tests/generic/310
index 2bcf72017d45e6beb11ebbe285af1e2dae87c6df..74bb04d650dd6e5b5ae8ea3632ff59a9a2841a5d 100755 (executable)
--- a/tests/generic/310
+++ b/tests/generic/310
@@ -27,6 +27,7 @@ seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
+here=`pwd`
 status=1       # failure is the default!
 
 _cleanup()
@@ -48,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"`
@@ -57,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"`
@@ -87,7 +88,7 @@ done
 
 _test_read()
 {
-       src/t_readdir_1 $SEQ_DIR &
+       $here/src/t_readdir_1 $SEQ_DIR &
        sleep $RUN_TIME
        $KILLALL_PROG t_readdir_1
        check_kernel_bug
@@ -98,7 +99,7 @@ _test_read()
 
 _test_lseek()
 {
-       src/t_readdir_2 $SEQ_DIR &
+       $here/src/t_readdir_2 $SEQ_DIR &
        sleep $RUN_TIME
        $KILLALL_PROG t_readdir_2
        check_kernel_bug