From c27a67f0e7e73ff1132c4d96c382c3faef9e3fba Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Fri, 23 Sep 2016 09:51:26 +0800 Subject: [PATCH] fstests: move now-generic xfs project quota tests generic Now that these tests have been made generic, move them into the generic/ dir and update group files. xfs/133 -> generic/383 xfs/134 -> generic/384 xfs/196 -> generic/385 xfs/262 -> generic/386 Signed-off-by: Eryu Guan --- tests/{xfs/133 => generic/383} | 0 tests/{xfs/133.out => generic/383.out} | 2 +- tests/{xfs/134 => generic/384} | 2 +- tests/{xfs/134.out => generic/384.out} | 2 +- tests/{xfs/196 => generic/385} | 2 +- tests/{xfs/196.out => generic/385.out} | 2 +- tests/{xfs/262 => generic/386} | 2 +- tests/generic/386.out | 2 ++ tests/generic/group | 4 ++++ tests/xfs/262.out | 2 -- tests/xfs/group | 4 ---- 11 files changed, 12 insertions(+), 12 deletions(-) rename tests/{xfs/133 => generic/383} (100%) rename tests/{xfs/133.out => generic/383.out} (90%) rename tests/{xfs/134 => generic/384} (99%) rename tests/{xfs/134.out => generic/384.out} (78%) rename tests/{xfs/196 => generic/385} (99%) rename tests/{xfs/196.out => generic/385.out} (99%) rename tests/{xfs/262 => generic/386} (99%) create mode 100644 tests/generic/386.out delete mode 100644 tests/xfs/262.out diff --git a/tests/xfs/133 b/tests/generic/383 similarity index 100% rename from tests/xfs/133 rename to tests/generic/383 diff --git a/tests/xfs/133.out b/tests/generic/383.out similarity index 90% rename from tests/xfs/133.out rename to tests/generic/383.out index 3accee64..d3f7496c 100644 --- a/tests/xfs/133.out +++ b/tests/generic/383.out @@ -1,4 +1,4 @@ -QA output created by 133 +QA output created by 383 === quota command output === Disk quotas for Project 123456-project (10) Filesystem Files Quota Limit Warn/Time Mounted on diff --git a/tests/xfs/134 b/tests/generic/384 similarity index 99% rename from tests/xfs/134 rename to tests/generic/384 index 58acc3b3..452d26e3 100755 --- a/tests/xfs/134 +++ b/tests/generic/384 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 134 +# FS QA Test No. 384 # # test to reproduce PV951636: # project quotas not updated if a file is mv'd into that directory diff --git a/tests/xfs/134.out b/tests/generic/384.out similarity index 78% rename from tests/xfs/134.out rename to tests/generic/384.out index 689cf2fe..4d7afa6f 100644 --- a/tests/xfs/134.out +++ b/tests/generic/384.out @@ -1,4 +1,4 @@ -QA output created by 134 +QA output created by 384 #1 1 0 0 00 [--------] #1 4 0 0 00 [--------] #1 5 0 0 00 [--------] diff --git a/tests/xfs/196 b/tests/generic/385 similarity index 99% rename from tests/xfs/196 rename to tests/generic/385 index f185c810..f07ae5d5 100755 --- a/tests/xfs/196 +++ b/tests/generic/385 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 196 +# FS QA Test No. 385 # # Make sure renames accross project boundaries are properly rejected # and that we don't use the wrong lock flags internally. diff --git a/tests/xfs/196.out b/tests/generic/385.out similarity index 99% rename from tests/xfs/196.out rename to tests/generic/385.out index a8c53d38..7217168b 100644 --- a/tests/xfs/196.out +++ b/tests/generic/385.out @@ -1,4 +1,4 @@ -QA output created by 196 +QA output created by 385 rename: No such file or directory rename: No such file or directory rename: No such file or directory diff --git a/tests/xfs/262 b/tests/generic/386 similarity index 99% rename from tests/xfs/262 rename to tests/generic/386 index 3c2c34ec..3aede60b 100755 --- a/tests/xfs/262 +++ b/tests/generic/386 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 262 +# FS QA Test No. 386 # # This test checks the project quota values reported by the quota # "df" and "report" subcommands to ensure they match what they diff --git a/tests/generic/386.out b/tests/generic/386.out new file mode 100644 index 00000000..e6d929a6 --- /dev/null +++ b/tests/generic/386.out @@ -0,0 +1,2 @@ +QA output created by 386 +Silence is golden. diff --git a/tests/generic/group b/tests/generic/group index 0e4432c6..ea2ced45 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -385,3 +385,7 @@ 380 quota auto quick 381 auto quick quota 382 auto quick quota +383 auto quick quota +384 quota auto quick +385 quota auto quick +386 auto quick quota diff --git a/tests/xfs/262.out b/tests/xfs/262.out deleted file mode 100644 index a0f7065a..00000000 --- a/tests/xfs/262.out +++ /dev/null @@ -1,2 +0,0 @@ -QA output created by 262 -Silence is golden. diff --git a/tests/xfs/group b/tests/xfs/group index 882f185c..798bf997 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -128,8 +128,6 @@ 130 fuzzers clone 131 auto quick clone 132 auto quick clone -133 auto quick quota -134 quota auto quick 135 auto logprint quick v2log 136 attr2 137 auto metadata v2log @@ -190,7 +188,6 @@ 193 auto quick clone 194 rw auto 195 ioctl dump auto quick -196 quota auto quick 197 dir auto quick 198 auto quick clone 199 mount auto quick @@ -255,7 +252,6 @@ 258 auto quick clone 259 auto quick 261 auto quick quota -262 auto quick quota 263 auto quick quota 264 auto quick mount 265 auto clone