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 <sandeen@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

10 files changed, 10 insertions, 10 deletions

diff --git a/tests/xfs/054 b/tests/generic/379
index b4e5dd19e7..fb7420b048 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
index 40c010cdf0..76a7a26a60 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: "<MOUNT>/testfile"
  Size: 0 Filetype: Regular File
diff --git a/tests/xfs/118 b/tests/generic/380
index 8861108f7b..2a6dbb786a 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
index 5cdb6944d9..7fe2c027fd 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
index 6b6a12f273..6b6a12f273 100755
--- a/tests/xfs/138
+++ b/tests/generic/381
diff --git a/tests/xfs/138.out b/tests/generic/381.out
index 71929c4487..50a1a27b01 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
index a2bc3ce980..a2bc3ce980 100755
--- a/tests/xfs/260
+++ b/tests/generic/382
diff --git a/tests/xfs/260.out b/tests/generic/382.out
index 5eb1070a23..ad32ccd334 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 a602b01655..0e4432c6c8 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 01569609d6..882f185c4a 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