diff options
| author | Murphy Zhou <jencce.kernel@gmail.com> | 2023-05-17 20:01:11 +0800 |
|---|---|---|
| committer | Zorro Lang <zlang@kernel.org> | 2023-05-28 02:04:54 +0800 |
| commit | 199342c9fa4883292f0b988c3c844cb0209ed524 (patch) | |
| tree | c8c4634c04459aa4d6f38841e7284bf0e008d570 | |
| parent | df0238186fe51b971aaec25371b4644753eab97c (diff) | |
| download | xfstests-dev-199342c9fa4883292f0b988c3c844cb0209ed524.tar.gz | |
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>
| -rw-r--r-- | common/filter | 2 | ||||
| -rw-r--r-- | common/quota | 2 | ||||
| -rwxr-xr-x | tests/xfs/106 | 4 | ||||
| -rwxr-xr-x | tests/xfs/152 | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/common/filter b/common/filter index 3e3fea7ea0..f10ba78a04 100644 --- 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 96b8d04424..6b529bf4b4 100644 --- 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 fc2281af52..388873bdee 100755 --- 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 dd33801d5e..325a05c141 100755 --- 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' } |