From 21723cdbf303e031d6429f67fec9768750a5db7d Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Fri, 4 Apr 2014 17:18:43 +1100 Subject: [PATCH] generic: Make some shared tests generic There are couple of tests in shared directory which really should be made generic, so move it. It is mostly collapse range tests, which really can be generic to make super we test every file system which adds collapse range support. Here is what we're moving in this commit. shared/001 -> generic/021 shared/002 -> generic/022 shared/003 -> generic/012 shared/004 -> generic/016 shared/005 -> generic/017 shared/218 -> generic/018 shared/305 -> generic/019 Signed-off-by: Lukas Czerner Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- tests/{shared/003 => generic/012} | 6 +++--- tests/{shared/003.out => generic/012.out} | 2 +- tests/{shared/004 => generic/016} | 6 +++--- tests/{shared/004.out => generic/016.out} | 2 +- tests/{shared/005 => generic/017} | 4 ++-- tests/generic/017.out | 4 ++++ tests/{shared/218 => generic/018} | 4 ++-- tests/{shared/218.out => generic/018.out} | 2 +- tests/{shared/305 => generic/019} | 4 ++-- tests/{shared/305.out => generic/019.out} | 2 +- tests/{shared/001 => generic/021} | 6 +++--- tests/{shared/001.out => generic/021.out} | 2 +- tests/{shared/002 => generic/022} | 6 +++--- tests/{shared/002.out => generic/022.out} | 2 +- tests/generic/group | 7 +++++++ tests/shared/005.out | 4 ---- tests/shared/group | 8 -------- 17 files changed, 35 insertions(+), 36 deletions(-) rename tests/{shared/003 => generic/012} (93%) mode change 100644 => 100755 rename tests/{shared/003.out => generic/012.out} (97%) rename tests/{shared/004 => generic/016} (93%) mode change 100644 => 100755 rename tests/{shared/004.out => generic/016.out} (97%) rename tests/{shared/005 => generic/017} (97%) mode change 100644 => 100755 create mode 100644 tests/generic/017.out rename tests/{shared/218 => generic/018} (98%) rename tests/{shared/218.out => generic/018.out} (93%) rename tests/{shared/305 => generic/019} (98%) rename tests/{shared/305.out => generic/019.out} (88%) rename tests/{shared/001 => generic/021} (93%) rename tests/{shared/001.out => generic/021.out} (97%) rename tests/{shared/002 => generic/022} (93%) mode change 100644 => 100755 rename tests/{shared/002.out => generic/022.out} (97%) delete mode 100644 tests/shared/005.out diff --git a/tests/shared/003 b/tests/generic/012 old mode 100644 new mode 100755 similarity index 93% rename from tests/shared/003 rename to tests/generic/012 index b6e9fd45a..e68929950 --- a/tests/shared/003 +++ b/tests/generic/012 @@ -1,8 +1,8 @@ #! /bin/bash -# FS QA Test No. shared/003 +# FS QA Test No. generic/012 # # Multi collapse range tests -# This testcase is one of the 4 testcases (shared 001 - 004) which tries to +# This testcase is one of the 4 testcases which tries to # test various corner cases for fcollapse range functionality over different # type of extents. These tests are based on generic/255 test case. # For the type of tests, check the description of _test_generic_punch @@ -48,7 +48,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 . ./common/punch # real QA test starts here -_supported_fs xfs ext4 +_supported_fs generic _supported_os Linux _require_xfs_io_falloc_punch diff --git a/tests/shared/003.out b/tests/generic/012.out similarity index 97% rename from tests/shared/003.out rename to tests/generic/012.out index 0a786c931..ffbf8a3a5 100644 --- a/tests/shared/003.out +++ b/tests/generic/012.out @@ -1,4 +1,4 @@ -QA output created by 003 +QA output created by 012 1. into a hole f4f35d60b3cc18aaa6d8d92f0cd3708a 2. into allocated space diff --git a/tests/shared/004 b/tests/generic/016 old mode 100644 new mode 100755 similarity index 93% rename from tests/shared/004 rename to tests/generic/016 index f55aae4f9..13a44883e --- a/tests/shared/004 +++ b/tests/generic/016 @@ -1,8 +1,8 @@ #! /bin/bash -# FS QA Test No. shared/004 +# FS QA Test No. generic/016 # # Delayed allocation multi collapse range tests -# This testcase is one of the 4 testcases (shared 001 - 004) which tries to +# This testcase is one of the 4 testcases which tries to # test various corner cases for fcollapse range functionality over different # type of extents. These tests are based on generic/255 test case. # For the type of tests, check the description of _test_generic_punch @@ -48,7 +48,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 . ./common/punch # real QA test starts here -_supported_fs xfs ext4 +_supported_fs generic _supported_os Linux _require_xfs_io_falloc_punch diff --git a/tests/shared/004.out b/tests/generic/016.out similarity index 97% rename from tests/shared/004.out rename to tests/generic/016.out index 9ccffd7a1..c45a44a8b 100644 --- a/tests/shared/004.out +++ b/tests/generic/016.out @@ -1,4 +1,4 @@ -QA output created by 004 +QA output created by 016 1. into a hole f4f35d60b3cc18aaa6d8d92f0cd3708a 2. into allocated space diff --git a/tests/shared/005 b/tests/generic/017 old mode 100644 new mode 100755 similarity index 97% rename from tests/shared/005 rename to tests/generic/017 index c6d4bb63c..93a4045bc --- a/tests/shared/005 +++ b/tests/generic/017 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. shared/005 +# FS QA Test No. generci/017 # # Test multiple fallocate collapse range calls on same file. # For different blocksizes, collapse a single alternate block multiple times @@ -39,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs ext4 +_supported_fs generic _supported_os Linux _require_scratch diff --git a/tests/generic/017.out b/tests/generic/017.out new file mode 100644 index 000000000..cc524ac5c --- /dev/null +++ b/tests/generic/017.out @@ -0,0 +1,4 @@ +QA output created by 017 +80 +80 +80 diff --git a/tests/shared/218 b/tests/generic/018 similarity index 98% rename from tests/shared/218 rename to tests/generic/018 index cd2076e51..25443917d 100755 --- a/tests/shared/218 +++ b/tests/generic/018 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 218 +# FS QA Test No. generic/018 # # Basic defragmentation sanity tests # @@ -42,7 +42,7 @@ _cleanup() . ./common/defrag # real QA test starts here -_supported_fs xfs ext4 btrfs +_supported_fs generic _supported_os Linux # We require scratch so that we'll have free contiguous space diff --git a/tests/shared/218.out b/tests/generic/018.out similarity index 93% rename from tests/shared/218.out rename to tests/generic/018.out index 7559cdd85..5f265d128 100644 --- a/tests/shared/218.out +++ b/tests/generic/018.out @@ -1,4 +1,4 @@ -QA output created by 218 +QA output created by 018 zero-length file: Before: 0 After: 0 diff --git a/tests/shared/305 b/tests/generic/019 similarity index 98% rename from tests/shared/305 rename to tests/generic/019 index 8e8b0cb74..1208c498e 100755 --- a/tests/shared/305 +++ b/tests/generic/019 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 305 +# FSQA Test No. generic/019 # # Run fsstress and fio(dio/aio and mmap) and simulate disk failure # check filesystem consistency at the end. @@ -35,7 +35,7 @@ status=1 # failure is the default! # get standard environment, filters and checks . ./common/rc . ./common/filter -_supported_fs ext3 ext4 xfs btrfs reiserfs +_supported_fs generic _supported_os Linux _need_to_be_root _require_scratch diff --git a/tests/shared/305.out b/tests/generic/019.out similarity index 88% rename from tests/shared/305.out rename to tests/generic/019.out index 1e8cfd62e..36c2af8b1 100644 --- a/tests/shared/305.out +++ b/tests/generic/019.out @@ -1,4 +1,4 @@ -QA output created by 305 +QA output created by 019 Allow global fail_make_request feature Start fsstress.. diff --git a/tests/shared/001 b/tests/generic/021 similarity index 93% rename from tests/shared/001 rename to tests/generic/021 index 9383ccbe1..7f3753ad2 100755 --- a/tests/shared/001 +++ b/tests/generic/021 @@ -1,8 +1,8 @@ #! /bin/bash -# FS QA Test No. shared/001 +# FS QA Test No. generic/021 # # Standard collapse range tests -# This testcase is one of the 4 testcases (shared 001 - 004) which tries to +# This testcase is one of the 4 testcases which tries to # test various corner cases for fcollapse range functionality over different # type of extents. These tests are based on generic/255 test case. # For the type of tests, check the description of _test_generic_punch @@ -48,7 +48,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 . ./common/punch # real QA test starts here -_supported_fs xfs ext4 +_supported_fs generic _supported_os Linux _require_xfs_io_falloc_punch diff --git a/tests/shared/001.out b/tests/generic/021.out similarity index 97% rename from tests/shared/001.out rename to tests/generic/021.out index 919dd126d..1137741c4 100644 --- a/tests/shared/001.out +++ b/tests/generic/021.out @@ -1,4 +1,4 @@ -QA output created by 001 +QA output created by 021 1. into a hole f4f35d60b3cc18aaa6d8d92f0cd3708a 2. into allocated space diff --git a/tests/shared/002 b/tests/generic/022 old mode 100644 new mode 100755 similarity index 93% rename from tests/shared/002 rename to tests/generic/022 index a9e54ba32..55e7206e6 --- a/tests/shared/002 +++ b/tests/generic/022 @@ -1,8 +1,8 @@ #! /bin/bash -# FS QA Test No. shared/002 +# FS QA Test No. generic/022 # # Delayed allocation collapse range tests -# This testcase is one of the 4 testcases (shared 001 - 004) which tries to +# This testcase is one of the 4 testcases which tries to # test various corner cases for fcollapse range functionality over different # type of extents. These tests are based on generic/255 test case. # For the type of tests, check the description of _test_generic_punch @@ -48,7 +48,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 . ./common/punch # real QA test starts here -_supported_fs xfs ext4 +_supported_fs generic _supported_os Linux _require_xfs_io_falloc_punch diff --git a/tests/shared/002.out b/tests/generic/022.out similarity index 97% rename from tests/shared/002.out rename to tests/generic/022.out index 60aaadc5d..96c2d3359 100644 --- a/tests/shared/002.out +++ b/tests/generic/022.out @@ -1,4 +1,4 @@ -QA output created by 002 +QA output created by 009 1. into a hole f4f35d60b3cc18aaa6d8d92f0cd3708a 2. into allocated space diff --git a/tests/generic/group b/tests/generic/group index 9867fdbbe..1c1693dc8 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -14,10 +14,17 @@ 009 auto quick prealloc 010 other udf auto 011 dir udf auto quick +012 auto quick prealloc 013 other ioctl udf auto quick 014 rw udf auto quick 015 other auto quick +016 auto quick prealloc +017 auto prealloc +018 auto fsr quick +019 aio dangerous enospc rw stress 020 metadata attr udf auto quick +021 auto quick prealloc +022 auto quick prealloc 053 acl repair auto quick 062 attr udf auto quick 068 other auto freeze dangerous stress diff --git a/tests/shared/005.out b/tests/shared/005.out deleted file mode 100644 index 8d30b9d7e..000000000 --- a/tests/shared/005.out +++ /dev/null @@ -1,4 +0,0 @@ -QA output created by 005 -80 -80 -80 diff --git a/tests/shared/group b/tests/shared/group index 6313639ea..533529613 100644 --- a/tests/shared/group +++ b/tests/shared/group @@ -3,18 +3,10 @@ # - do not start group names with a digit # - comment line before each group is "new" description # -001 auto quick prealloc -002 auto quick prealloc -003 auto quick prealloc -004 auto quick prealloc -005 auto prealloc 006 auto enospc 032 mkfs auto quick 051 acl udf auto quick -218 auto fsr quick 243 auto quick prealloc 272 auto enospc rw 289 auto quick 298 auto trim -305 aio dangerous enospc rw stress - -- 2.51.0