From aa31b5456586ef98cd0d78efa6636e72620702b0 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 8 Jun 2009 11:27:23 -0500 Subject: [PATCH] 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. Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig --- 075 | 6 +++--- 112 | 11 ++++++++++- 127 | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/075 b/075 index 7948c1f0..49d006d1 100755 --- 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 70fa4879..d6c29526 100755 --- 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 44db4fba..30f4fdb5 100755 --- 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 -- 2.39.5