From: Eric Sandeen <sandeen@sandeen.net>
To: "fstests@vger.kernel.org" <fstests@vger.kernel.org>
Subject: [PATCH] xfs/077: fix test for userspace meta_uuid support
Date: Thu, 20 Aug 2015 15:14:31 -0500 [thread overview]
Message-ID: <55D63527.2050404@sandeen.net> (raw)
The current _require_meta_uuid() test looks for a failure return
code from xfs_db -x -c "uuid generate" but in fact this exits
with success. (In fact uuid_f always exits with success; perhaps
this needs fixing, but that's in the wild now).
So grep for the string(s) stating that it failed, instead.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
diff --git a/common/rc b/common/rc
index 70d2fa8..737a701 100644
--- a/common/rc
+++ b/common/rc
@@ -2720,8 +2720,11 @@ _require_meta_uuid()
# This will create a crc fs on $SCRATCH_DEV
_require_xfs_crc
- $XFS_DB_PROG -x -c "uuid generate" $SCRATCH_DEV >/dev/null 2>&1 \
- || _notrun "Userspace doesn't support meta_uuid feature"
+ $XFS_DB_PROG -x -c "uuid restore" $SCRATCH_DEV 2>&1 \
+ | grep -q "invalid UUID\|supported on V5 fs" \
+ && _notrun "Userspace doesn't support meta_uuid feature"
+
+ $XFS_DB_PROG -x -c "uuid generate" $SCRATCH_DEV >/dev/null 2>&1
_scratch_mount >/dev/null 2>&1 \
|| _notrun "Kernel doesn't support meta_uuid feature"
reply other threads:[~2015-08-20 20:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=55D63527.2050404@sandeen.net \
--to=sandeen@sandeen.net \
--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