From: Murphy Zhou <xzhou@redhat.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: Pavel Reichl <preichl@redhat.com>, Murphy Zhou <xzhou@redhat.com>,
fstests@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v2] common/rc: fix MKSWAP_PROG quoting
Date: Wed, 1 Sep 2021 14:16:20 +0800 [thread overview]
Message-ID: <20210901054822.phzkg5xqoocx3duq@xzhoux.usersys.redhat.com> (raw)
In-Reply-To: <YS5hRsSXNHYQdUv9@mit.edu>
After commit
0e4dd8b9 common/rc: fix ignoring of errors on
we are getting this error message when running swapfiles tests:
+./common/rc: line 2553: MKSWAP_PROG: command not found
Rewrite the line and add a filter for mkswap.
Signed-off-by: Murphy Zhou <xzhou@redhat.com>
---
Thanks all for the suggestions!
v2:
rewrite the line and add a filter
source filters for generic/643
common/filter | 6 ++++++
common/rc | 2 +-
tests/generic/643 | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/common/filter b/common/filter
index 2efbbd99..0883a3fd 100644
--- a/common/filter
+++ b/common/filter
@@ -661,5 +661,11 @@ _filter_quota_report()
s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|'
}
+# Filter mkswap warning about the permissions
+_filter_mkswap_stderr()
+{
+ grep -v "insecure permission"
+}
+
# make sure this script returns success
/bin/true
diff --git a/common/rc b/common/rc
index 46b6b220..0a3933a5 100644
--- a/common/rc
+++ b/common/rc
@@ -2550,7 +2550,7 @@ _format_swapfile() {
$CHATTR_PROG +C "$fname" > /dev/null 2>&1
_pwrite_byte 0x61 0 "$sz" "$fname" >> $seqres.full
# Ignore permission complaints on filesystems that don't support perms
- $(MKSWAP_PROG "$fname" 2> >(grep -v 'insecure permission' >&2)) >> $seqres.full
+ $MKSWAP_PROG "$fname" 2>&1 >> $seqres.full | _filter_mkswap_stderr
}
_swapon_file() {
diff --git a/tests/generic/643 b/tests/generic/643
index 2bb9d220..9b067ea2 100755
--- a/tests/generic/643
+++ b/tests/generic/643
@@ -21,6 +21,7 @@ _cleanup()
rm -f $tmp.*
test -n "$swapfile" && swapoff $swapfile &> /dev/null
}
+. ./common/filter
# real QA test starts here
_supported_fs generic
--
2.20.1
next prev parent reply other threads:[~2021-09-01 6:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 3:04 [PATCH] common/rc: fix MKSWAP_PROG quoting Murphy Zhou
2021-08-31 5:26 ` Zorro Lang
2021-08-31 7:38 ` Pavel Reichl
2021-08-31 13:42 ` Zorro Lang
2021-08-31 17:05 ` Theodore Ts'o
2021-09-01 6:16 ` Murphy Zhou [this message]
2021-09-01 7:15 ` [PATCH v2] " Dave Chinner
2021-09-01 9:40 ` [PATCH v3] " Xiong Zhou
2021-09-03 17:48 ` Darrick J. Wong
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=20210901054822.phzkg5xqoocx3duq@xzhoux.usersys.redhat.com \
--to=xzhou@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=preichl@redhat.com \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).