common/{filter,quota}, xfs/1{06,52}: fix grep pattern

Newer(3.9) grep is complaining about these unnecessary
backslashes before # and -, and breaking the golden output.

Signed-off-by: Murphy Zhou <jencce.kernel@gmail.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/filter b/common/filter
index 3e3fea7ea02eda622f0b4c5c8f10753315c39602..f10ba78a04f66fec653b8b3ceb2dafdf674c849f 100644 (file)
--- a/common/filter
+++ b/common/filter
@@ -293,7 +293,7 @@ _filter_project_quota()
        # until the GETNEXTQUOTA ioctl came into use.  Filter it out.
        # But if you specify a name for ID 0, that means you want to
        # deal with it by yourself, this function won't filter it out.
-       _filter_quota | grep -v "^\#0 \|^(null) "
+       _filter_quota | grep -v "^#0 \|^(null) "
 }
 
 # Account for different "ln" failure messages

diff --git a/common/quota b/common/quota
index 96b8d044242756a411fe686aac1334a83b03c4a5..6b529bf4b43190bde6009543c58cf82e9b4038d3 100644 (file)
--- a/common/quota
+++ b/common/quota
@@ -191,7 +191,7 @@ _scratch_enable_pquota()
 _require_setquota_project()
 {
        setquota --help 2>&1 | \
-               grep -q "\-P, \-\-project[[:space:]]*set limits for project"
+               grep -q -- "-P, --project[[:space:]]*set limits for project"
        if [ "$?" -ne 0 ];then
                _notrun "setquota doesn't support project quota (-P)"
        fi

diff --git a/tests/xfs/106 b/tests/xfs/106
index fc2281af52cb9f85ed297f807832aa252ec001e0..388873bdee6c051dc1d60e7f9bb11ced01e1462e 100755 (executable)
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -59,13 +59,13 @@ clean_files()
 
 filter_quot()
 {
-       _filter_quota | grep -v "root \|\#0 " \
+       _filter_quota | grep -v "root \|#0 " \
                | sed -e '/#[0-9]*/s/#[0-9]*/#ID/g'
 }
 
 filter_report()
 {
-       _filter_quota | grep -v "^root \|^\#0 " \
+       _filter_quota | grep -v "^root \|^#0 " \
                | sed -e '/^#[0-9]*/s/^#[0-9]*/#ID/g'
 }
 

diff --git a/tests/xfs/152 b/tests/xfs/152
index dd33801d5ec55aae686598fbbde11cfb8637d790..325a05c14124cba91a013036b467dd9b1596746d 100755 (executable)
--- a/tests/xfs/152
+++ b/tests/xfs/152
@@ -98,13 +98,13 @@ clean_files()
 
 filter_quot()
 {
-       _filter_quota | grep -v "root \|\#0 " \
+       _filter_quota | grep -v "root \|#0 " \
                | sed -e '/#[0-9]*/s/#[0-9]*/#ID/g'
 }
 
 filter_report()
 {
-       _filter_quota | grep -v "^root \|^\#0 " \
+       _filter_quota | grep -v "^root \|^#0 " \
                | sed -e '/^#[0-9]*/s/^#[0-9]*/#ID/g'
 }