[Top] [All Lists]

[PATCH] xfstests: fix flink test V2

To: <linux-btrfs@xxxxxxxxxxxxxxx>, <xfs@xxxxxxxxxxx>, <sandeen@xxxxxxxxxx>
Subject: [PATCH] xfstests: fix flink test V2
From: Josef Bacik <jbacik@xxxxxx>
Date: Thu, 8 May 2014 14:38:30 -0400
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : mime-version : content-type; s=facebook; bh=kRzl2i6qv+WyFk8GeVcCb1qA+RZoEUtKMbzkZ2pwXtc=; b=LCvjfgOqv3PBDT07+B3s5ZKHV7iQa0HDRc1XA5QbcpkDuA+lABnknMTd//AIbO1aCYvG 1tBclf7XRI8GZpeGM26XZozmjlivkrG1UUzeB6fLG7KRqIFYvUCiTLNkBipR60NZPvwt xc6e4HlxEBA5lU7UN0h0qIk+zPTahCOFkC8=
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@xxxxxx>
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`

<Prev in Thread] Current Thread [Next in Thread>