Skip to contentSkip to conversation

xfstests: Allow fsx tests to run on generic filesystems

PATCH In review Eric Sandeen 3 participants 4 messages Jun 8, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests: Allow fsx tests to run on generic filesystems

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.

---

075 +3 -3
index 7948c1f..49d006d 100755
@@ -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
112 +10 -1
index 70fa487..d6c2952 100755
@@ -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 ] || \
127 +1 -1
index 44db4fb..30f4fdb 100755
@@ -103,7 +103,7 @@ _fsx_std_mmap()
 }
 
 # real QA test starts here
-_supported_fs xfs
+_supported_fs generic
 _supported_os Linux
 
 _setup_testdir

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Eric Sandeen

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.

Good bandaid for now, but it would be even better to get a fsx version using the generic prealloc calls one day :)

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Eric Sandeen

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.

Quoted 8 lines
Quoted 5 lines

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.

Good bandaid for now, but it would be even better to get a fsx version using the generic prealloc calls one day :)

Will do after we're done w/ the planned fsx gyrations....

-Eric

Quoted 2 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#3 lore raw
In reply to Eric Sandeen
Quoted 4 lines · Eric Sandeen

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.

Quoted 8 lines

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.

Quoted 74 lines

---

075 +1 -2
index 7948c1f..49d006d 100755
@@ -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

075 +1 -0
+	    # HACK: only xfs handles preallocation (-x) so just skip this  

test
return
fi
fi

075 +1 -1
@@ -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

112 +5 -0
index 70fa487..d6c2952 100755
@@ -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

112 +5 -1
+            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 ] || \

127 +1 -1
index 44db4fb..30f4fdb 100755
@@ -103,7 +103,7 @@ _fsx_std_mmap()
 }
 
 # real QA test starts here
-_supported_fs xfs
+_supported_fs generic

_supported_os Linux

Quoted 7 lines

_setup_testdir

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs