diff mbox

xfs/191: skip tests on older xfsprogs

Message ID 1471403935-24222-1-git-send-email-yangx.jy@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Xiao Yang Aug. 17, 2016, 3:18 a.m. UTC
If we don't have /tmp/foo file on xfsprogs 3.2.2, _require_xfs_mkfs_validation
will fail because mkfs.xfs can't create this file.  We need to skip tests
before xfsprogs 4.7.0, so fix it.  the feature has been introduced since
xfsprogs 4.2.0:
commit 20cec860e16b267ea0c71a2f648fa2b26aad2e65
Author: Eric Sandeen <sandeen@sandeen.net>
Date: Fri Jul 31 09:04:11 2015 +1000

  mkfs.xfs: always use underlying fs sector size when mkfs'ing a file

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 common/rc | 3 +++
 1 file changed, 3 insertions(+)

Comments

Eryu Guan Aug. 17, 2016, 3:36 a.m. UTC | #1
On Wed, Aug 17, 2016 at 11:18:55AM +0800, Xiao Yang wrote:
> If we don't have /tmp/foo file on xfsprogs 3.2.2, _require_xfs_mkfs_validation
> will fail because mkfs.xfs can't create this file.  We need to skip tests
> before xfsprogs 4.7.0, so fix it.  the feature has been introduced since
> xfsprogs 4.2.0:
> commit 20cec860e16b267ea0c71a2f648fa2b26aad2e65
> Author: Eric Sandeen <sandeen@sandeen.net>
> Date: Fri Jul 31 09:04:11 2015 +1000
> 
>   mkfs.xfs: always use underlying fs sector size when mkfs'ing a file
> 
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  common/rc | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/common/rc b/common/rc
> index b19b698..db99794 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3889,6 +3889,9 @@ _get_fs_sysfs_attr()
>  # number of failed cases.
>  _mkfs_validation_check()
>  {
> +	if [ ! -f /tmp/foo ]; then
> +		touch /tmp/foo
> +	fi

I think the file can be touched unconditionally.

Thanks,
Eryu

>  	local cmd="$MKFS_XFS_PROG -f -N -d file,name=/tmp/foo,size=$((1024 * 1024 * 1024))"
>  	$cmd -s size=2s >/dev/null 2>&1
>  	local sum=$?
> -- 
> 1.8.3.1
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Tulak Aug. 17, 2016, 9:27 a.m. UTC | #2
On Wed, Aug 17, 2016 at 5:36 AM, Eryu Guan <eguan@redhat.com> wrote:

>>  _mkfs_validation_check()
>>  {
>> +     if [ ! -f /tmp/foo ]; then
>> +             touch /tmp/foo
>> +     fi
>
> I think the file can be touched unconditionally.
>

If the file already exists and mtime/atime of the file is important,
then it could be an issue. It looks improbable, but still, maybe we
should be on the safe side?

Anyway, thanks for spotting this.

Jan
diff mbox

Patch

diff --git a/common/rc b/common/rc
index b19b698..db99794 100644
--- a/common/rc
+++ b/common/rc
@@ -3889,6 +3889,9 @@  _get_fs_sysfs_attr()
 # number of failed cases.
 _mkfs_validation_check()
 {
+	if [ ! -f /tmp/foo ]; then
+		touch /tmp/foo
+	fi
 	local cmd="$MKFS_XFS_PROG -f -N -d file,name=/tmp/foo,size=$((1024 * 1024 * 1024))"
 	$cmd -s size=2s >/dev/null 2>&1
 	local sum=$?