[PATCH] common/rc: ignore MKFS_OPTIONS in _scratch_mkfs_xfs_supported()

[PATCH] common/rc: ignore MKFS_OPTIONS in _scratch_mkfs_xfs_supported()

[Eryu Guan]

In recent mkfs updates in xfsprogs, commit 9090e187bc3e ("mkfs: add
respecification detection to generic parsing") added re-specification
detection to "-m" option, it causes several tests _notrun if
MKFS_OPTIONS has the same options as those being tested in
_scratch_mkfs_xfs_supported(), because they're specified multiple times.

	MKFS_OPTIONS="-m crc=0" ./check xfs/001
	xfs/001 3s ... [not run] mkfs.xfs doesn't have crc feature

Fix it by removing MKFS_OPTIONS when testing mkfs features in
_scratch_mkfs_xfs_supported(), only $mkfs_opts matters.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 51092a0..c7a7667 100644
--- a/common/rc
+++ b/common/rc
@@ -477,7 +477,7 @@ _scratch_mkfs_xfs_supported()
 
 	_scratch_options mkfs
 
-	$MKFS_XFS_PROG -N $MKFS_OPTIONS $SCRATCH_OPTIONS $mkfs_opts $SCRATCH_DEV
+	$MKFS_XFS_PROG -N $SCRATCH_OPTIONS $mkfs_opts $SCRATCH_DEV
 }
 
 _scratch_mkfs_xfs()
-- 
2.5.5

Re: [PATCH] common/rc: ignore MKFS_OPTIONS in _scratch_mkfs_xfs_supported()

[Eryu Guan]

On Sun, Jun 12, 2016 at 03:57:09PM +0800, Eryu Guan wrote:
> In recent mkfs updates in xfsprogs, commit 9090e187bc3e ("mkfs: add
> respecification detection to generic parsing") added re-specification
> detection to "-m" option, it causes several tests _notrun if
> MKFS_OPTIONS has the same options as those being tested in
> _scratch_mkfs_xfs_supported(), because they're specified multiple times.
> 
> 	MKFS_OPTIONS="-m crc=0" ./check xfs/001
> 	xfs/001 3s ... [not run] mkfs.xfs doesn't have crc feature
> 
> Fix it by removing MKFS_OPTIONS when testing mkfs features in
> _scratch_mkfs_xfs_supported(), only $mkfs_opts matters.
> 
> Signed-off-by: Eryu Guan <eguan@redhat.com>

Self-NAK, this breaks other tests like xfs/186. Currently xfs/186 only
runs with MKFS_OPTIONS="-m crc=0" set, and depends on MKFS_OPTIONS in
_scratch_mkfs_xfs_supported(). Not sure what's the best fix yet.

Thanks,
Eryu

> ---
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index 51092a0..c7a7667 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -477,7 +477,7 @@ _scratch_mkfs_xfs_supported()
>  
>  	_scratch_options mkfs
>  
> -	$MKFS_XFS_PROG -N $MKFS_OPTIONS $SCRATCH_OPTIONS $mkfs_opts $SCRATCH_DEV
> +	$MKFS_XFS_PROG -N $SCRATCH_OPTIONS $mkfs_opts $SCRATCH_DEV
>  }
>  
>  _scratch_mkfs_xfs()
> -- 
> 2.5.5
>