From 9db4da5c43ceae6b782cf47fc1283fa5f41c3939 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Thu, 12 Feb 2015 14:20:27 +1100 Subject: [PATCH] generic: relocate xfs shutdown tests into tests/generic/ This patch moves the generic testcases defined in xfs into tests/generic/. xfs/053 -> generic/042 xfs/137 -> generic/043 xfs/138 -> generic/044 xfs/139 -> generic/045 xfs/140 -> generic/046 xfs/179 -> generic/047 xfs/180 -> generic/048 xfs/182 -> generic/049 xfs/200 -> generic/050 xfs/306 -> generic/051 Signed-off-by: Jaegeuk Kim Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- tests/{xfs/053 => generic/042} | 4 ++-- tests/{xfs/053.out => generic/042.out} | 2 +- tests/{xfs/137 => generic/043} | 8 ++++---- tests/generic/043.out | 1 + tests/{xfs/138 => generic/044} | 8 ++++---- tests/generic/044.out | 1 + tests/{xfs/139 => generic/045} | 8 ++++---- tests/generic/045.out | 1 + tests/{xfs/140 => generic/046} | 8 ++++---- tests/generic/046.out | 1 + tests/{xfs/179 => generic/047} | 6 +++--- tests/generic/047.out | 1 + tests/{xfs/180 => generic/048} | 6 +++--- tests/generic/048.out | 1 + tests/{xfs/182 => generic/049} | 6 +++--- tests/generic/049.out | 1 + tests/{xfs/200 => generic/050} | 8 ++++---- tests/{xfs/200.out => generic/050.out} | 2 +- tests/{xfs/306 => generic/051} | 4 ++-- tests/{xfs/306.out => generic/051.out} | 2 +- tests/generic/group | 10 ++++++++++ tests/xfs/137.out | 1 - tests/xfs/138.out | 1 - tests/xfs/139.out | 1 - tests/xfs/140.out | 1 - tests/xfs/179.out | 1 - tests/xfs/180.out | 1 - tests/xfs/182.out | 1 - tests/xfs/group | 10 ---------- 29 files changed, 53 insertions(+), 53 deletions(-) rename tests/{xfs/053 => generic/042} (98%) rename tests/{xfs/053.out => generic/042.out} (92%) rename tests/{xfs/137 => generic/043} (96%) create mode 100644 tests/generic/043.out rename tests/{xfs/138 => generic/044} (96%) create mode 100644 tests/generic/044.out rename tests/{xfs/139 => generic/045} (96%) create mode 100644 tests/generic/045.out rename tests/{xfs/140 => generic/046} (96%) create mode 100644 tests/generic/046.out rename tests/{xfs/179 => generic/047} (97%) create mode 100644 tests/generic/047.out rename tests/{xfs/180 => generic/048} (97%) create mode 100644 tests/generic/048.out rename tests/{xfs/182 => generic/049} (97%) create mode 100644 tests/generic/049.out rename tests/{xfs/200 => generic/050} (96%) rename tests/{xfs/200.out => generic/050.out} (97%) rename tests/{xfs/306 => generic/051} (98%) rename tests/{xfs/306.out => generic/051.out} (60%) delete mode 100644 tests/xfs/137.out delete mode 100644 tests/xfs/138.out delete mode 100644 tests/xfs/139.out delete mode 100644 tests/xfs/140.out delete mode 100644 tests/xfs/179.out delete mode 100644 tests/xfs/180.out delete mode 100644 tests/xfs/182.out diff --git a/tests/xfs/053 b/tests/generic/042 similarity index 98% rename from tests/xfs/053 rename to tests/generic/042 index 6428d5c7..6eecbdce 100755 --- a/tests/xfs/053 +++ b/tests/generic/042 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 053 +# FS QA Test No. 042 # # Test stale data exposure via writeback using various file allocation # modification commands. The presumption is that such commands result in partial @@ -83,7 +83,7 @@ _crashtest() } # Modify as appropriate. -_supported_fs xfs +_supported_fs generic _supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/xfs/053.out b/tests/generic/042.out similarity index 92% rename from tests/xfs/053.out rename to tests/generic/042.out index c777fe29..c1130e12 100644 --- a/tests/xfs/053.out +++ b/tests/generic/042.out @@ -1,4 +1,4 @@ -QA output created by 053 +QA output created by 042 falloc -k wrote 65536/65536 bytes at offset 0 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/xfs/137 b/tests/generic/043 similarity index 96% rename from tests/xfs/137 rename to tests/generic/043 index eb9a5fab..47bc7662 100755 --- a/tests/xfs/137 +++ b/tests/generic/043 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 137 +# FSQA Test No. 043 # # Test for NULL files problem # @@ -36,13 +36,13 @@ trap "exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch _require_scratch_shutdown _require_fiemap -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 _scratch_mount # create files @@ -103,4 +103,4 @@ do done status=0 -exit +exit diff --git a/tests/generic/043.out b/tests/generic/043.out new file mode 100644 index 00000000..7851fbe9 --- /dev/null +++ b/tests/generic/043.out @@ -0,0 +1 @@ +QA output created by 043 diff --git a/tests/xfs/138 b/tests/generic/044 similarity index 96% rename from tests/xfs/138 rename to tests/generic/044 index 809a8ee5..c59aaf35 100755 --- a/tests/xfs/138 +++ b/tests/generic/044 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 138 +# FSQA Test No. 044 # # Test for NULL files problem # @@ -36,13 +36,13 @@ trap "exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch _require_scratch_shutdown _require_fiemap -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 _scratch_mount # create files @@ -109,4 +109,4 @@ do done status=0 -exit +exit diff --git a/tests/generic/044.out b/tests/generic/044.out new file mode 100644 index 00000000..ef9885b7 --- /dev/null +++ b/tests/generic/044.out @@ -0,0 +1 @@ +QA output created by 044 diff --git a/tests/xfs/139 b/tests/generic/045 similarity index 96% rename from tests/xfs/139 rename to tests/generic/045 index de91a291..6c601a6d 100755 --- a/tests/xfs/139 +++ b/tests/generic/045 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 139 +# FSQA Test No. 045 # # Test for NULL files problem # @@ -36,13 +36,13 @@ trap "exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch _require_scratch_shutdown _require_fiemap -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 _scratch_mount # create files @@ -109,4 +109,4 @@ do done status=0 -exit +exit diff --git a/tests/generic/045.out b/tests/generic/045.out new file mode 100644 index 00000000..5b0d4894 --- /dev/null +++ b/tests/generic/045.out @@ -0,0 +1 @@ +QA output created by 045 diff --git a/tests/xfs/140 b/tests/generic/046 similarity index 96% rename from tests/xfs/140 rename to tests/generic/046 index 4882abdd..76993d40 100755 --- a/tests/xfs/140 +++ b/tests/generic/046 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 140 +# FSQA Test No. 046 # # Test for NULL files problem # @@ -36,13 +36,13 @@ trap "exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch _require_scratch_shutdown _require_fiemap -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 _scratch_mount # create files @@ -106,4 +106,4 @@ do done status=0 -exit +exit diff --git a/tests/generic/046.out b/tests/generic/046.out new file mode 100644 index 00000000..a14e5921 --- /dev/null +++ b/tests/generic/046.out @@ -0,0 +1 @@ +QA output created by 046 diff --git a/tests/xfs/179 b/tests/generic/047 similarity index 97% rename from tests/xfs/179 rename to tests/generic/047 index 2f3673e5..0418a3bd 100755 --- a/tests/xfs/179 +++ b/tests/generic/047 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 179 +# FSQA Test No. 047 # # Test for NULL files problem # test inode size is on disk after fsync @@ -37,13 +37,13 @@ trap "exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch _require_scratch_shutdown _require_fiemap -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 _scratch_mount _check_files() diff --git a/tests/generic/047.out b/tests/generic/047.out new file mode 100644 index 00000000..58e2353c --- /dev/null +++ b/tests/generic/047.out @@ -0,0 +1 @@ +QA output created by 047 diff --git a/tests/xfs/180 b/tests/generic/048 similarity index 97% rename from tests/xfs/180 rename to tests/generic/048 index 40a186a6..558fe5f6 100755 --- a/tests/xfs/180 +++ b/tests/generic/048 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 180 +# FSQA Test No. 048 # # Test for NULL files problem # test inode size is on disk after sync @@ -37,13 +37,13 @@ trap "exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch _require_scratch_shutdown _require_fiemap -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 _scratch_mount # Do we have enough space on disk? 10G diff --git a/tests/generic/048.out b/tests/generic/048.out new file mode 100644 index 00000000..75546301 --- /dev/null +++ b/tests/generic/048.out @@ -0,0 +1 @@ +QA output created by 048 diff --git a/tests/xfs/182 b/tests/generic/049 similarity index 97% rename from tests/xfs/182 rename to tests/generic/049 index 028e121d..646d39e1 100755 --- a/tests/xfs/182 +++ b/tests/generic/049 @@ -1,5 +1,5 @@ #! /bin/bash -# FSQA Test No. 182 +# FSQA Test No. 049 # # Test for NULL files problem # test inode size is on disk after sync - expose log replay bug @@ -37,13 +37,13 @@ trap "exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch _require_scratch_shutdown _require_fiemap -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 _scratch_mount _check_files() diff --git a/tests/generic/049.out b/tests/generic/049.out new file mode 100644 index 00000000..cb0061b3 --- /dev/null +++ b/tests/generic/049.out @@ -0,0 +1 @@ +QA output created by 049 diff --git a/tests/xfs/200 b/tests/generic/050 similarity index 96% rename from tests/xfs/200 rename to tests/generic/050 index bd6d0fdc..a32e049a 100755 --- a/tests/xfs/200 +++ b/tests/generic/050 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 200 +# FS QA Test No. 050 # # Check out various mount/remount/unmount scenarious on a read-only blockdev. # @@ -41,14 +41,14 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common/filter # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux _require_scratch_nocheck _require_scratch_shutdown _require_norecovery -_scratch_mkfs_xfs >/dev/null 2>&1 +_scratch_mkfs >/dev/null 2>&1 # # Mark the device read-only @@ -119,7 +119,7 @@ blockdev --setrw $SCRATCH_DEV # the underlying device is not write protected. # echo "mounting filesystem that needs recovery with -o ro:" -_scratch_mount -o ro 2>&1 | _filter_scratch +_scratch_mount -o ro 2>&1 | _filter_scratch # success, all done echo "*** done" diff --git a/tests/xfs/200.out b/tests/generic/050.out similarity index 97% rename from tests/xfs/200.out rename to tests/generic/050.out index 40f91633..f8dbb7a4 100644 --- a/tests/xfs/200.out +++ b/tests/generic/050.out @@ -1,4 +1,4 @@ -QA output created by 200 +QA output created by 050 setting device read-only mounting read-only block device: mount: SCRATCH_DEV is write-protected, mounting read-only diff --git a/tests/xfs/306 b/tests/generic/051 similarity index 98% rename from tests/xfs/306 rename to tests/generic/051 index 5af5aced..614939f3 100755 --- a/tests/xfs/306 +++ b/tests/generic/051 @@ -1,5 +1,5 @@ #!/bin/bash -# FS QA Test No. xfs/306 +# FS QA Test No. 051 # # Basic log recovery stress test - do lots of stuff, shut down in the middle of # it and check that recovery runs to completion and everything can be @@ -45,7 +45,7 @@ _cleanup() trap "_cleanup; exit \$status" 0 1 2 3 15 # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux _require_scratch diff --git a/tests/xfs/306.out b/tests/generic/051.out similarity index 60% rename from tests/xfs/306.out rename to tests/generic/051.out index 9fd18a40..daf2e6a4 100644 --- a/tests/xfs/306.out +++ b/tests/generic/051.out @@ -1,2 +1,2 @@ -QA output created by 306 +QA output created by 051 No output is good. Failures are loud. diff --git a/tests/generic/group b/tests/generic/group index fb67b574..d38240e8 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -44,6 +44,16 @@ 039 metadata auto quick 040 metadata auto quick 041 metadata auto quick +042 auto quick rw +043 metadata log auto +044 metadata log auto +045 metadata log auto +046 metadata log auto +047 metadata rw auto +048 metadata rw auto +049 metadata rw auto +050 mount auto quick +051 auto stress log metadata repair 053 acl repair auto quick 062 attr udf auto quick 068 other auto freeze dangerous stress diff --git a/tests/xfs/137.out b/tests/xfs/137.out deleted file mode 100644 index 0fd8b813..00000000 --- a/tests/xfs/137.out +++ /dev/null @@ -1 +0,0 @@ -QA output created by 137 diff --git a/tests/xfs/138.out b/tests/xfs/138.out deleted file mode 100644 index f3eb4116..00000000 --- a/tests/xfs/138.out +++ /dev/null @@ -1 +0,0 @@ -QA output created by 138 diff --git a/tests/xfs/139.out b/tests/xfs/139.out deleted file mode 100644 index be0ebc21..00000000 --- a/tests/xfs/139.out +++ /dev/null @@ -1 +0,0 @@ -QA output created by 139 diff --git a/tests/xfs/140.out b/tests/xfs/140.out deleted file mode 100644 index e6506b89..00000000 --- a/tests/xfs/140.out +++ /dev/null @@ -1 +0,0 @@ -QA output created by 140 diff --git a/tests/xfs/179.out b/tests/xfs/179.out deleted file mode 100644 index e5b0ba9e..00000000 --- a/tests/xfs/179.out +++ /dev/null @@ -1 +0,0 @@ -QA output created by 179 diff --git a/tests/xfs/180.out b/tests/xfs/180.out deleted file mode 100644 index 9035544c..00000000 --- a/tests/xfs/180.out +++ /dev/null @@ -1 +0,0 @@ -QA output created by 180 diff --git a/tests/xfs/182.out b/tests/xfs/182.out deleted file mode 100644 index 5e665c89..00000000 --- a/tests/xfs/182.out +++ /dev/null @@ -1 +0,0 @@ -QA output created by 182 diff --git a/tests/xfs/group b/tests/xfs/group index 9ffd17bf..de34822c 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -50,7 +50,6 @@ 050 quota auto quick 051 auto log metadata 052 quota db auto quick -053 auto quick rw 054 quota auto quick 055 dump ioctl remote tape 056 dump ioctl auto quick @@ -101,10 +100,6 @@ 122 other auto quick 134 quota auto quick 136 attr2 -137 metadata log auto -138 metadata log auto -139 metadata log auto -140 metadata log auto 142 dmapi 143 dmapi 144 dmapi @@ -141,10 +136,7 @@ 176 dmapi 177 dmapi 178 mkfs other auto -179 metadata rw auto -180 metadata rw auto 181 log auto quick -182 metadata rw auto 183 rw other auto quick 185 dmapi 186 attr auto quick @@ -158,7 +150,6 @@ 196 quota auto quick 197 dir auto quick 199 mount auto quick -200 mount auto quick 201 metadata auto quick 202 repair auto quick 203 ioctl auto @@ -203,4 +194,3 @@ 303 auto quick quota 304 auto quick quota 305 auto quota -306 auto stress log metadata repair -- 2.39.5