All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] xfstests: fix flink test V2
@ 2014-05-08 18:38 ` Josef Bacik
  0 siblings, 0 replies; 6+ messages in thread
From: Josef Bacik @ 2014-05-08 18:38 UTC (permalink / raw)
  To: linux-btrfs, xfs, sandeen

I don't have flink support in my xfsprogs, but it doesn't fail with "command not
found" or whatever, it fails because I don't have the -T option, whereas Eric
gets an error about $TEST_DIR being a directory because his xfs_io tries to open
the directory first before it parses the options.  So fix this by checking flink
with these two cases and don't run if we hit either of them.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
V1->V2: check for "Is a directory" errors that Eric mentioned, move test up into
the flink specific case.

 common/rc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/rc b/common/rc
index 5c13db5..f37b310 100644
--- a/common/rc
+++ b/common/rc
@@ -1248,6 +1248,8 @@ _require_xfs_io_command()
 	"flink" )
 		testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
 			$TEST_DIR 2>&1`
+		echo $testio | egrep -q "invalid option|Is a directory" && \
+			_notrun "xfs_io $command support is missing"
 		;;
 	*)
 		testio=`$XFS_IO_PROG -c "$command help" 2>&1`
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH] xfstests: fix flink test V2
@ 2014-05-08 18:38 ` Josef Bacik
  0 siblings, 0 replies; 6+ messages in thread
From: Josef Bacik @ 2014-05-08 18:38 UTC (permalink / raw)
  To: linux-btrfs, xfs, sandeen

I don't have flink support in my xfsprogs, but it doesn't fail with "command not
found" or whatever, it fails because I don't have the -T option, whereas Eric
gets an error about $TEST_DIR being a directory because his xfs_io tries to open
the directory first before it parses the options.  So fix this by checking flink
with these two cases and don't run if we hit either of them.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
V1->V2: check for "Is a directory" errors that Eric mentioned, move test up into
the flink specific case.

 common/rc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/rc b/common/rc
index 5c13db5..f37b310 100644
--- a/common/rc
+++ b/common/rc
@@ -1248,6 +1248,8 @@ _require_xfs_io_command()
 	"flink" )
 		testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
 			$TEST_DIR 2>&1`
+		echo $testio | egrep -q "invalid option|Is a directory" && \
+			_notrun "xfs_io $command support is missing"
 		;;
 	*)
 		testio=`$XFS_IO_PROG -c "$command help" 2>&1`
-- 
1.8.3.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] xfstests: fix flink test V2
  2014-05-08 18:38 ` Josef Bacik
@ 2014-05-08 18:41   ` Eric Sandeen
  -1 siblings, 0 replies; 6+ messages in thread
From: Eric Sandeen @ 2014-05-08 18:41 UTC (permalink / raw)
  To: Josef Bacik, linux-btrfs, xfs

On 5/8/14, 1:38 PM, Josef Bacik wrote:
> I don't have flink support in my xfsprogs, but it doesn't fail with "command not
> found" or whatever, it fails because I don't have the -T option, whereas Eric
> gets an error about $TEST_DIR being a directory because his xfs_io tries to open
> the directory first before it parses the options.  So fix this by checking flink
> with these two cases and don't run if we hit either of them.  Thanks,
> 
> Signed-off-by: Josef Bacik <jbacik@fb.com>

Looks good to me, thanks.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
> V1->V2: check for "Is a directory" errors that Eric mentioned, move test up into
> the flink specific case.
> 
>  common/rc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/common/rc b/common/rc
> index 5c13db5..f37b310 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -1248,6 +1248,8 @@ _require_xfs_io_command()
>  	"flink" )
>  		testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
>  			$TEST_DIR 2>&1`
> +		echo $testio | egrep -q "invalid option|Is a directory" && \
> +			_notrun "xfs_io $command support is missing"
>  		;;
>  	*)
>  		testio=`$XFS_IO_PROG -c "$command help" 2>&1`
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xfstests: fix flink test V2
@ 2014-05-08 18:41   ` Eric Sandeen
  0 siblings, 0 replies; 6+ messages in thread
From: Eric Sandeen @ 2014-05-08 18:41 UTC (permalink / raw)
  To: Josef Bacik, linux-btrfs, xfs

On 5/8/14, 1:38 PM, Josef Bacik wrote:
> I don't have flink support in my xfsprogs, but it doesn't fail with "command not
> found" or whatever, it fails because I don't have the -T option, whereas Eric
> gets an error about $TEST_DIR being a directory because his xfs_io tries to open
> the directory first before it parses the options.  So fix this by checking flink
> with these two cases and don't run if we hit either of them.  Thanks,
> 
> Signed-off-by: Josef Bacik <jbacik@fb.com>

Looks good to me, thanks.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
> V1->V2: check for "Is a directory" errors that Eric mentioned, move test up into
> the flink specific case.
> 
>  common/rc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/common/rc b/common/rc
> index 5c13db5..f37b310 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -1248,6 +1248,8 @@ _require_xfs_io_command()
>  	"flink" )
>  		testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
>  			$TEST_DIR 2>&1`
> +		echo $testio | egrep -q "invalid option|Is a directory" && \
> +			_notrun "xfs_io $command support is missing"
>  		;;
>  	*)
>  		testio=`$XFS_IO_PROG -c "$command help" 2>&1`
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xfstests: fix flink test V2
  2014-05-08 18:38 ` Josef Bacik
@ 2014-05-09  7:24   ` Christoph Hellwig
  -1 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2014-05-09  7:24 UTC (permalink / raw)
  To: Josef Bacik; +Cc: linux-btrfs, xfs, sandeen

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] xfstests: fix flink test V2
@ 2014-05-09  7:24   ` Christoph Hellwig
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2014-05-09  7:24 UTC (permalink / raw)
  To: Josef Bacik; +Cc: sandeen, linux-btrfs, xfs

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-05-09  7:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-08 18:38 [PATCH] xfstests: fix flink test V2 Josef Bacik
2014-05-08 18:38 ` Josef Bacik
2014-05-08 18:41 ` Eric Sandeen
2014-05-08 18:41   ` Eric Sandeen
2014-05-09  7:24 ` Christoph Hellwig
2014-05-09  7:24   ` Christoph Hellwig

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.