From: Eryu Guan <eguan@redhat.com>
To: David Disseldorp <ddiss@suse.de>
Cc: fstests@vger.kernel.org
Subject: Re: [PATCH] common: use xfs_io to obtain the xfsprogs version
Date: Thu, 12 Jan 2017 11:51:24 +0800 [thread overview]
Message-ID: <20170112035124.GU1859@eguan.usersys.redhat.com> (raw)
In-Reply-To: <20170111104820.7367-1-ddiss@suse.de>
On Wed, Jan 11, 2017 at 11:48:20AM +0100, David Disseldorp wrote:
> xfs_db is currently used for this, but is otherwise only used for XFS
> specific tests. This change allows for the generic tests to be run on a
> system without the xfs_db binary.
>
> Signed-off-by: David Disseldorp <ddiss@suse.de>
> ---
> common/config | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/common/config b/common/config
> index 6cce7ce..1604aa9 100644
> --- a/common/config
> +++ b/common/config
> @@ -226,11 +226,11 @@ export UDEV_SETTLE_PROG
> # Generate a comparable xfsprogs version number in the form of
> # major * 10000 + minor * 100 + release
> #
> -# $ xfs_db -V
> -# xfs_db version 2.9.7
> +# $ xfs_io -V
> +# xfs_io version 2.9.7
> #
> # so, 2.9.7 = 20907
> -_version=`$XFS_DB_PROG -V | $AWK_PROG '
> +_version=`$XFS_IO_PROG -V | $AWK_PROG '
I noticed that this $_version is only assigned to XFSPROGS_VERSION, and
the only user of $XFSPROGS_VERSION is xfs/188.
if [ $XFSPROGS_VERSION -lt 21000 ]; then
_notrun "this test requires case-insensitive support"
fi
That's a test added in 2008, now we avoid skipping tests by checking on
some version number, we tend to add new _require rules to actually test
for the requirements. e.g. for xfs/188, I think we can have:
in common/xfs:
# this test requires mkfs.xfs have case-insensitive naming support
_require_xfs_mkfs_ciname()
{
_scratch_mkfs_xfs_supported -n version=ci >/dev/null 2>&1 \
|| _notrun "need case-insensitive naming support in mkfs.xfs"
}
And remove all the version detection & checking code from common/config
and xfs/188, and call the new _require rule in the test.
Thanks,
Eryu
next prev parent reply other threads:[~2017-01-12 3:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-11 10:48 [PATCH] common: use xfs_io to obtain the xfsprogs version David Disseldorp
2017-01-11 13:25 ` Eric Sandeen
2017-01-12 3:51 ` Eryu Guan [this message]
2017-01-12 12:26 ` David Disseldorp
2017-01-12 17:18 ` [PATCH 1/3] xfs/188: add and use _require_xfs_mkfs_ciname David Disseldorp
2017-01-12 17:18 ` [PATCH 2/3] common: remove unused XFSPROGS_VERSION check David Disseldorp
2017-01-12 17:18 ` [PATCH 3/3] common: remove tmp.mkfs[err/std] files by name David Disseldorp
2017-01-13 4:24 ` Eryu Guan
2017-01-13 10:11 ` David Disseldorp
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=20170112035124.GU1859@eguan.usersys.redhat.com \
--to=eguan@redhat.com \
--cc=ddiss@suse.de \
--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