]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
Allow fsx tests to run on generic filesystems
authorEric Sandeen <sandeen@sandeen.net>
Mon, 8 Jun 2009 16:27:23 +0000 (11:27 -0500)
committerEric Sandeen <sandeen@sandeen.net>
Mon, 8 Jun 2009 16:27:23 +0000 (11:27 -0500)
There is already logic in 075 to gracefully skip nfs for fsx
invocations with -x (xfs-specific preallocation) - just extend
this to any non-xfs filesystem, and add to test 112 as well.

Later we can change this behavior to use fallocate and include
more filesystems but this gets some fsx coverage for now.

Test 127 doesn't seem to have anything xfs-specific, so mark
that as generic too.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
075
112
127

diff --git a/075 b/075
index 7948c1f0ebd71d3d94a2c673f3168cc76dc2eed7..49d006d147c4bc9178a746574299699b95a15c3f 100755 (executable)
--- a/075
+++ b/075
@@ -66,11 +66,11 @@ _do_test()
     echo "fsx.$_n : $_filter_param"
     echo "-----------------------------------------------"
 
-    if [ "$FSTYP" = "nfs" ]
+    if [ "$FSTYP" != "xfs" ]
     then
        if [ "$_n" = "1" -o "$_n" = "3" ]
        then
-           # HACK: nfs don't handle preallocation (-x) so just skip this test
+           # HACK: only xfs handles preallocation (-x) so just skip this test
            return
        fi
     fi
@@ -124,7 +124,7 @@ _process_args()
 
 
 # real QA test starts here
-_supported_fs xfs udf nfs
+_supported_fs generic
 _supported_os IRIX Linux
 
 size10=`expr 10 \* 1024 \* 1024`       # 10 megabytes
diff --git a/112 b/112
index 70fa48798ca95c4b32034fd6a0197a34e1cb2384..d6c29526ae0821b50c6e3f785a203b1d7522835f 100755 (executable)
--- a/112
+++ b/112
@@ -66,6 +66,15 @@ _do_test()
     echo "fsx.$_n : $_filter_param"
     echo "-----------------------------------------------"
 
+    if [ "$FSTYP" != "xfs" ]
+    then
+        if [ "$_n" = "1" -o "$_n" = "3" ]
+        then
+            # HACK: only xfs handles preallocation (-x) so just skip this test
+            return
+        fi
+    fi
+
     # This cd and use of -P gets full debug on $here (not TEST_DEV)
     cd $out
     if ! $here/ltp/fsx $_param -P $here $seq.$_n >/dev/null
@@ -113,7 +122,7 @@ _process_args()
 
 
 # real QA test starts here
-_supported_fs xfs
+_supported_fs generic
 _supported_os Linux
 
 [ -x $here/ltp/aio-stress ] || \
diff --git a/127 b/127
index 44db4fbabd18fecc8b1735009c7f1f1dabb926a3..30f4fdb5a6b3b2521f41bf86887eff1666c9c5b3 100755 (executable)
--- a/127
+++ b/127
@@ -103,7 +103,7 @@ _fsx_std_mmap()
 }
 
 # real QA test starts here
-_supported_fs xfs
+_supported_fs generic
 _supported_os Linux
 
 _setup_testdir