From: Murphy Zhou <jencce.kernel@gmail.com>
To: fstests@vger.kernel.org
Subject: [PATCH] common/{filter,quota}, xfs/1{06,52}: fix grep pattern
Date: Tue, 16 May 2023 16:19:35 +0800 [thread overview]
Message-ID: <20230516081935.2208793-1-jencce.kernel@gmail.com> (raw)
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>
---
common/filter | 2 +-
common/quota | 2 +-
tests/xfs/106 | 4 ++--
tests/xfs/152 | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/filter b/common/filter
index 3e3fea7e..f10ba78a 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 96b8d044..0a526e07 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 fc2281af..388873bd 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 dd33801d..325a05c1 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'
}
--
2.31.1
next reply other threads:[~2023-05-16 8:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 8:19 Murphy Zhou [this message]
2023-05-17 1:28 ` [PATCH] common/{filter,quota}, xfs/1{06,52}: fix grep pattern Zorro Lang
2023-05-17 6:35 ` Murphy Zhou
2023-05-17 8:20 ` Murphy Zhou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230516081935.2208793-1-jencce.kernel@gmail.com \
--to=jencce.kernel@gmail.com \
--cc=fstests@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox