xfs
[Top] [All Lists]

[PATCH] xfstests: add _require_seek_data_hole to check seek data/hole

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfstests: add _require_seek_data_hole to check seek data/hole
From: Zheng Liu <gnehzuil.liu@xxxxxxxxx>
Date: Tue, 26 Mar 2013 17:14:12 +0800
Cc: Zheng Liu <wenqing.lz@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=ObQ8M5gTV9N+nWBNUWVxitrTj2emkPmR05N+QwOpZaI=; b=T61oE3Y/gttdgXKza2c82lruRA8n/qmL2g7touwJ0wo3ZEad7qarCaBy/Fe0+h1Z5l vZVWJRdwQAiE/lAh1lzdhbUE0XrqnzIsgBAdboRPLWs+INyizEWKJo69eIBG1XiY8LPp KfUxdifFFhbMxWj37jN4eHDgSUOG59qtXObBd8B/uagVyX7BguWYipTn7f8zqV7hwbdZ JytL1elsUWdKOiYvB9M1MkhugDaR5lvgugIoXICwQLjA/5sKcfE3rjeHvXEI5PNQ19IP n3To3hyWDzcp3mlsPjhOfWIFo/qfI2bRqPvK8ePrFzpOhWi+vwqYMsLjfzUGfIq0ELjE hsmg==
From: Zheng Liu <wenqing.lz@xxxxxxxxxx>

In xfstests 285 and 286 we don't check whether the target file system
supports seek data/hole operation or not.  Here _require_seek_data_hole
is defined to do this work.

Signed-off-by: Zheng Liu <wenqing.lz@xxxxxxxxxx>
---
 285                    |  1 +
 286                    |  2 ++
 common.rc              | 12 ++++++++++++
 src/seek_sanity_test.c | 19 ++++++++++++++-----
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/285 b/285
index 8726b9e..4cad633 100644
--- a/285
+++ b/285
@@ -42,6 +42,7 @@ _supported_fs generic
 _supported_os Linux
 
 _require_xfs_io_falloc
+_require_seek_data_hole
 
 BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile
 
diff --git a/286 b/286
index 9567244..6f34724 100644
--- a/286
+++ b/286
@@ -39,6 +39,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_seek_data_hole
+
 src=$TEST_DIR/seek_copy_testfile
 dest=$TEST_DIR/seek_copy_testfile.dest
 
diff --git a/common.rc b/common.rc
index 319680d..3c01211 100644
--- a/common.rc
+++ b/common.rc
@@ -1205,6 +1205,18 @@ _require_fail_make_request()
  not found. Seems that CONFIG_FAIL_MAKE_REQUEST kernel config option not 
enabled"
 }
 
+#
+# Check if the file system supports seek_data/hole.
+#
+_require_seek_data_hole()
+{
+       testfile=$TEST_DIR/$$.seek
+       testseek=`$here/src/seek_sanity_test -t $testfile 2>&1`
+       rm -f $testfile &>/dev/null
+       echo $testseek | grep -q "Kernel does not support" && \
+               _notrun "File system does not support llseek(2) SEEK_DATA/HOLE"
+}
+
 # check that a FS on a device is mounted
 # if so, return mount point
 #
diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c
index 3897f02..3b5217b 100644
--- a/src/seek_sanity_test.c
+++ b/src/seek_sanity_test.c
@@ -660,17 +660,26 @@ int main(int argc, char **argv)
 {
        int ret = -1;
        int i = 0;
+       int opt;
+       int check_support = 0;
        int numtests = sizeof(seek_tests) / sizeof(struct testrec);
 
-       if (argc != 2) {
-               fprintf(stdout, "Usage: %s base_file_path\n", argv[0]);
-               return ret;
+       while ((opt = getopt(argc, argv, "t")) != -1) {
+               switch (opt) {
+               case 't':
+                       check_support++;
+                       break;
+               default:
+                       fprintf(stdout, "Usage: %s [-t] base_file_path\n",
+                               argv[0]);
+                       return ret;
+               }
        }
 
-       base_file_path = (char *)strdup(argv[1]);
+       base_file_path = (char *)strdup(argv[optind]);
 
        ret = test_basic_support();
-       if (ret)
+       if (ret || check_support)
                goto out;
 
        for (i = 0; i < numtests; ++i) {
-- 
1.7.12.rc2.18.g61b472e

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfstests: add _require_seek_data_hole to check seek data/hole, Zheng Liu <=