From fe901ccaa7bbad2f346dfad7734e92e9763f1f7e Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 20 Sep 2016 17:24:59 -0500 Subject: [PATCH] fstests: move now-generic quota tests to generic Now that these tests have been made generic, move them into the generic/ dir and update group files. xfs/054 -> generic/379 xfs/118 -> generic/380 xfs/138 -> generic/381 xfs/260 -> generic/382 Signed-off-by: Eric Sandeen Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/{xfs/054 => generic/379} | 2 +- tests/{xfs/054.out => generic/379.out} | 2 +- tests/{xfs/118 => generic/380} | 2 +- tests/{xfs/118.out => generic/380.out} | 2 +- tests/{xfs/138 => generic/381} | 0 tests/{xfs/138.out => generic/381.out} | 2 +- tests/{xfs/260 => generic/382} | 0 tests/{xfs/260.out => generic/382.out} | 2 +- tests/generic/group | 4 ++++ tests/xfs/group | 4 ---- 10 files changed, 10 insertions(+), 10 deletions(-) rename tests/{xfs/054 => generic/379} (99%) rename tests/{xfs/054.out => generic/379.out} (99%) rename tests/{xfs/118 => generic/380} (99%) rename tests/{xfs/118.out => generic/380.out} (97%) rename tests/{xfs/138 => generic/381} (100%) rename tests/{xfs/138.out => generic/381.out} (93%) rename tests/{xfs/260 => generic/382} (100%) rename tests/{xfs/260.out => generic/382.out} (96%) diff --git a/tests/xfs/054 b/tests/generic/379 similarity index 99% rename from tests/xfs/054 rename to tests/generic/379 index b4e5dd19..fb7420b0 100755 --- a/tests/xfs/054 +++ b/tests/generic/379 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 054 +# FS QA Test No. 379 # # Check behavior of chown with both user and group quota enabled, # and changing both user and group together via chown(2). diff --git a/tests/xfs/054.out b/tests/generic/379.out similarity index 99% rename from tests/xfs/054.out rename to tests/generic/379.out index 40c010cd..76a7a26a 100644 --- a/tests/xfs/054.out +++ b/tests/generic/379.out @@ -1,4 +1,4 @@ -QA output created by 054 +QA output created by 379 *** Default mount options File: "/testfile" Size: 0 Filetype: Regular File diff --git a/tests/xfs/118 b/tests/generic/380 similarity index 99% rename from tests/xfs/118 rename to tests/generic/380 index 8861108f..2a6dbb78 100755 --- a/tests/xfs/118 +++ b/tests/generic/380 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 118 +# FS QA Test No. 380 # # To test out pv#940675 crash in xfs_trans_brelse + quotas # Without the fix, this will create an ASSERT failure in debug kernels diff --git a/tests/xfs/118.out b/tests/generic/380.out similarity index 97% rename from tests/xfs/118.out rename to tests/generic/380.out index 5cdb6944..7fe2c027 100644 --- a/tests/xfs/118.out +++ b/tests/generic/380.out @@ -1,4 +1,4 @@ -QA output created by 118 +QA output created by 380 mkfs on scratch mount with quotas creating quota file with holes diff --git a/tests/xfs/138 b/tests/generic/381 similarity index 100% rename from tests/xfs/138 rename to tests/generic/381 diff --git a/tests/xfs/138.out b/tests/generic/381.out similarity index 93% rename from tests/xfs/138.out rename to tests/generic/381.out index 71929c44..50a1a27b 100644 --- a/tests/xfs/138.out +++ b/tests/generic/381.out @@ -1,4 +1,4 @@ -QA output created by 138 +QA output created by 381 == user test == === quota command output === SCRATCH_DEV 0 102400 204800 00 [--------] SCRATCH_MNT diff --git a/tests/xfs/260 b/tests/generic/382 similarity index 100% rename from tests/xfs/260 rename to tests/generic/382 diff --git a/tests/xfs/260.out b/tests/generic/382.out similarity index 96% rename from tests/xfs/260.out rename to tests/generic/382.out index 5eb1070a..ad32ccd3 100644 --- a/tests/xfs/260.out +++ b/tests/generic/382.out @@ -1,4 +1,4 @@ -QA output created by 260 +QA output created by 382 === user quota test === user blocks and inode limit fsgqa 0 40960 40960 00 [--------] 0 40 40 00 [--------] diff --git a/tests/generic/group b/tests/generic/group index a602b016..0e4432c6 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -381,3 +381,7 @@ 376 auto quick metadata 377 attr auto quick metadata 378 auto quick metadata +379 quota auto quick +380 quota auto quick +381 auto quick quota +382 auto quick quota diff --git a/tests/xfs/group b/tests/xfs/group index 01569609..882f185c 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -51,7 +51,6 @@ 051 auto log metadata 052 quota db auto quick 053 attr acl repair quick auto -054 quota auto quick 055 dump ioctl remote tape 056 dump ioctl auto quick 057 acl auto @@ -115,7 +114,6 @@ 115 parent attr 116 quota auto quick 117 fuzzers -118 quota auto quick 119 log v2log auto freeze dangerous 120 fuzzers 121 log auto quick @@ -135,7 +133,6 @@ 135 auto logprint quick v2log 136 attr2 137 auto metadata v2log -138 auto quick quota 139 auto quick clone 140 auto clone 141 auto log metadata @@ -257,7 +254,6 @@ 257 auto quick clone 258 auto quick clone 259 auto quick -260 auto quick quota 261 auto quick quota 262 auto quick quota 263 auto quick quota -- 2.25.1