public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] common/rc: fix fsmap check
@ 2016-09-19  8:26 Xiao Yang
  2016-09-19 22:31 ` Dave Chinner
  0 siblings, 1 reply; 11+ messages in thread
From: Xiao Yang @ 2016-09-19  8:26 UTC (permalink / raw)
  To: fstests; +Cc: darrick.wong, sandeen, Xiao Yang

I got an error about $TEST_DIR being a directory when xfs/273 ran, because
xfs_io tried to open the directory first before it parsed the -T options.
So fix it by checking this error.

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

diff --git a/common/rc b/common/rc
index 13afc6a..1be803b 100644
--- a/common/rc
+++ b/common/rc
@@ -2051,7 +2051,7 @@ _require_xfs_io_command()
 	"fsmap" )
 		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
 			$TEST_DIR 2>&1`
-		echo $testio | egrep -q "Inappropriate ioctl" && \
+		echo $testio | egrep -q "Inappropriate ioctl|Is a directory" && \
 			_notrun "xfs_io $command support is missing"
 		;;
 	*)
-- 
1.8.3.1

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

end of thread, other threads:[~2016-09-20  5:55 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-19  8:26 [PATCH] common/rc: fix fsmap check Xiao Yang
2016-09-19 22:31 ` Dave Chinner
2016-09-20  2:45   ` Xiao Yang
2016-09-20  3:03     ` Darrick J. Wong
2016-09-20  3:10       ` Xiao Yang
2016-09-20  3:15       ` [PATCH v2] " Xiao Yang
2016-09-20  3:59         ` Eryu Guan
2016-09-20  4:40           ` Xiao Yang
2016-09-20  4:48             ` Darrick J. Wong
2016-09-20  5:23               ` [PATCH v3] " Xiao Yang
2016-09-20  5:55                 ` Darrick J. Wong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox