common/{filter,quota}, xfs/1{06,52}: fix grep pattern
PATCH v2 1/1 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 <[email protected]>
---
v2:
Apply Zorro's suggestion, removing all backslashes.
common/filter | 2 +- common/quota | 2 +- tests/xfs/106 | 4 ++-- tests/xfs/152 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
common/filter +1 -1
@@ -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
common/quota +1 -1
@@ -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
tests/xfs/106 +2 -2
@@ -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' }
tests/xfs/152 +2 -2
@@ -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' }
Signature · 1 line
2.31.1
Quoted 7 lines · Murphy Zhou
Newer(3.9) grep is complaining about these unnecessary backslashes before # and -, and breaking the golden output.
Signed-off-by Murphy Zhou <[email protected]>---
v2:
Apply Zorro's suggestion, removing all backslashes.
Thanks, this version looks good to me, I'll merge it after testing done.
And if you don't mind I'd like to change the subject from:
"common/{filter,quota}, xfs/1{06,52}: fix grep pattern"
to:
"fstests: fix the stray backslash warning from grep"
when I merge it.
Reviewed-by Zorro Lang <[email protected]>
Quoted 76 lines
common/filter | 2 +- common/quota | 2 +- tests/xfs/106 | 4 ++-- tests/xfs/152 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)common/filter +1
-1@@ -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 messagescommon/quota +1
-1@@ -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)" fitests/xfs/106 +2
-2@@ -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' }tests/xfs/152 +2
-2@@ -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' }Signature · 1 line
2.31.1