xfs: renumber tests after merge

Tests were merged with high seq numbers to avoid conflicts with
other tests. Now renumber them to contiguous numbers, as all other
tests have been merged correctly. This is easier to do than
assigning the final seq numbers at commit time.

Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/xfs/876 b/tests/xfs/331
similarity index 99%
rename from tests/xfs/876
rename to tests/xfs/331
index dae3f3aa1219f01a0a1546f3b616b5d15c0f8230..8a7692d80df471364478cf481fa7132b8a51efd5 100755 (executable)
--- a/tests/xfs/876
+++ b/tests/xfs/331
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 876
+# FS QA Test No. 331
 #
 # Create a big enough rmapbt that we tickle a fdblocks accounting bug.
 #

diff --git a/tests/xfs/876.out b/tests/xfs/331.out
similarity index 68%
rename from tests/xfs/876.out
rename to tests/xfs/331.out
index 96c1970405b44342f82a1e1f6df9691e86379a35..fed402546107bb888d64e0a3eb46499be0e8abbb 100644 (file)
--- a/tests/xfs/876.out
+++ b/tests/xfs/331.out
@@ -1,4 +1,4 @@
-QA output created by 876
+QA output created by 331
 + create scratch fs
 + mount fs image
 + make some files

diff --git a/tests/xfs/877 b/tests/xfs/332
similarity index 99%
rename from tests/xfs/877
rename to tests/xfs/332
index 04fdb4c532cfde12723b87e6017cc45b687c664e..e10c53bc24b3a3562f12e86daa4b59f13b96c7c3 100755 (executable)
--- a/tests/xfs/877
+++ b/tests/xfs/332
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 877
+# FS QA Test No. 332
 #
 # Make sure query_range returns -EINVAL if lowkey > highkey.
 #

diff --git a/tests/xfs/877.out b/tests/xfs/332.out
similarity index 88%
rename from tests/xfs/877.out
rename to tests/xfs/332.out
index 4a2242f46964017a043534aa7f059d7ca59da82c..9beff7cc3704c0ad4e1323015599cc0efbf29dc2 100644 (file)
--- a/tests/xfs/877.out
+++ b/tests/xfs/332.out
@@ -1,4 +1,4 @@
-QA output created by 877
+QA output created by 332
 Format and mount
 Create some files
 Manipulate file

diff --git a/tests/xfs/878 b/tests/xfs/333
similarity index 99%
rename from tests/xfs/878
rename to tests/xfs/333
index c9ec8c6b53a3c658fc3734ab0bc51b2290bad31e..f7f233d1d78d85d474cce31bb6ad33a5fdce1c24 100755 (executable)
--- a/tests/xfs/878
+++ b/tests/xfs/333
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 878
+# FS QA Test No. 333
 #
 # Set rrmapino to another inode on an non-rt rmap fs and see if repair fixes it.
 #

diff --git a/tests/xfs/878.out b/tests/xfs/333.out
similarity index 87%
rename from tests/xfs/878.out
rename to tests/xfs/333.out
index e13450681d23b5f6956b22448dc44e3e23bff7d3..bee9bbcc8117a473981d59ad2aad43d18ce408c6 100644 (file)
--- a/tests/xfs/878.out
+++ b/tests/xfs/333.out
@@ -1,4 +1,4 @@
-QA output created by 878
+QA output created by 333
 Format and mount
 Create some files
 Corrupt fs

diff --git a/tests/xfs/879 b/tests/xfs/334
similarity index 98%
rename from tests/xfs/879
rename to tests/xfs/334
index 247b3afbb30eef97724f6f84bcb671077f27afea..1eb1e38f5ceb3907951523eb27158dcd223a3965 100755 (executable)
--- a/tests/xfs/879
+++ b/tests/xfs/334
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 879
+# FS QA Test No. 334
 #
 # Ensure that we can create a few realtime files on a rmapbt filesystem.
 #

diff --git a/tests/xfs/879.out b/tests/xfs/334.out
similarity index 86%
rename from tests/xfs/879.out
rename to tests/xfs/334.out
index 9dfe48b471ec48dd9779bcdea252af21f8457e79..fea41f9f269b58b8c01c254b7e24da7ba94fc4fd 100644 (file)
--- a/tests/xfs/879.out
+++ b/tests/xfs/334.out
@@ -1,4 +1,4 @@
-QA output created by 879
+QA output created by 334
 Format and mount
 Create a few files
 Grab contents

diff --git a/tests/xfs/880 b/tests/xfs/335
similarity index 99%
rename from tests/xfs/880
rename to tests/xfs/335
index 7c3879e826f327a7136dd0d0363719b2a71a4254..5e48f59b5e755e25679b518a64bd75a6075c7d8f 100755 (executable)
--- a/tests/xfs/880
+++ b/tests/xfs/335
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 880
+# FS QA Test No. 335
 #
 # Exercise expanding and shrinking the realtime rmap btree.
 #

diff --git a/tests/xfs/880.out b/tests/xfs/335.out
similarity index 84%
rename from tests/xfs/880.out
rename to tests/xfs/335.out
index b87665befe78c0965e8d8c395bd9a3db51e30bce..e7bc0b9ab2e932de0c16a28e7e6602e276e803cf 100644 (file)
--- a/tests/xfs/880.out
+++ b/tests/xfs/335.out
@@ -1,4 +1,4 @@
-QA output created by 880
+QA output created by 335
 Format and mount
 Create a three-level rtrmapbt
 Create big file

diff --git a/tests/xfs/881 b/tests/xfs/336
similarity index 99%
rename from tests/xfs/881
rename to tests/xfs/336
index 437895cf685d59f0c51f4332691bd59687b505ba..b3b703d10f419ba458f83cdcf8c1534af7b75c46 100755 (executable)
--- a/tests/xfs/881
+++ b/tests/xfs/336
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 881
+# FS QA Test No. 336
 #
 # Exercise metadump on realtime rmapbt preservation.
 #

diff --git a/tests/xfs/881.out b/tests/xfs/336.out
similarity index 84%
rename from tests/xfs/881.out
rename to tests/xfs/336.out
index 6ad156cd1fbca9b56fe52521b8b5e59b59307bb7..aa61973da3e8449502718b36ab7668cd4dcb5409 100644 (file)
--- a/tests/xfs/881.out
+++ b/tests/xfs/336.out
@@ -1,4 +1,4 @@
-QA output created by 881
+QA output created by 336
 Format and mount
 Create a three-level rtrmapbt
 Create big file

diff --git a/tests/xfs/882 b/tests/xfs/337
similarity index 99%
rename from tests/xfs/882
rename to tests/xfs/337
index 17bd4f096c3dfc721eb999d486e60ece73d60e30..96a7be093b2817a9349d1f80d55c429164c65127 100755 (executable)
--- a/tests/xfs/882
+++ b/tests/xfs/337
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 882
+# FS QA Test No. 337
 #
 # Corrupt the realtime rmapbt and see how the kernel and xfs_repair deal.
 #

diff --git a/tests/xfs/882.out b/tests/xfs/337.out
similarity index 86%
rename from tests/xfs/882.out
rename to tests/xfs/337.out
index 5ebe62028e319135ee69899a0be494d0d2ad6a9d..1ee2db79acfeb4607cfc50f63fa9817a6497c734 100644 (file)
--- a/tests/xfs/882.out
+++ b/tests/xfs/337.out
@@ -1,4 +1,4 @@
-QA output created by 882
+QA output created by 337
 + create scratch fs
 + mount fs image
 + make some files

diff --git a/tests/xfs/883 b/tests/xfs/338
similarity index 99%
rename from tests/xfs/883
rename to tests/xfs/338
index 8b20b2be9a35e1acda3ad72313129a9291d23145..755510c88cb9a382d24be5a389e852fbec517243 100755 (executable)
--- a/tests/xfs/883
+++ b/tests/xfs/338
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 883
+# FS QA Test No. 338
 #
 # Set rrmapino to zero on an rtrmap fs and see if repair fixes it.
 #

diff --git a/tests/xfs/883.out b/tests/xfs/338.out
similarity index 82%
rename from tests/xfs/883.out
rename to tests/xfs/338.out
index ac5117f61582b921ba5831eeaec213e87dd3dad1..751d87b607bc2db523b21a32e774bda5f8ce5bb7 100644 (file)
--- a/tests/xfs/883.out
+++ b/tests/xfs/338.out
@@ -1,4 +1,4 @@
-QA output created by 883
+QA output created by 338
 Format and mount
 Create some files
 Corrupt fs

diff --git a/tests/xfs/884 b/tests/xfs/339
similarity index 99%
rename from tests/xfs/884
rename to tests/xfs/339
index 3097fa00ba279f6a077ddc7f82811aea36857f12..734d47bb3b8b469c6aaadf9bf4d5661fd99cf701 100755 (executable)
--- a/tests/xfs/884
+++ b/tests/xfs/339
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 884
+# FS QA Test No. 339
 #
 # Link rrmapino into the rootdir on an rtrmap fs and see if repair fixes it.
 #

diff --git a/tests/xfs/884.out b/tests/xfs/339.out
similarity index 87%
rename from tests/xfs/884.out
rename to tests/xfs/339.out
index 17a73effd020a73a5daa20c5300a12b9a8ece656..7b0a775b616d8403568a0a01b830e591a03ac694 100644 (file)
--- a/tests/xfs/884.out
+++ b/tests/xfs/339.out
@@ -1,4 +1,4 @@
-QA output created by 884
+QA output created by 339
 Format and mount
 Create some files
 Corrupt fs

diff --git a/tests/xfs/885 b/tests/xfs/340
similarity index 99%
rename from tests/xfs/885
rename to tests/xfs/340
index 3e8aba9eeed38e84ae86548ec97b28b2fa6d4005..8cc50a29d91d1db3e218b1827aae751076dfc143 100755 (executable)
--- a/tests/xfs/885
+++ b/tests/xfs/340
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 885
+# FS QA Test No. 340
 #
 # Set rrmapino to another inode on an rtrmap fs and see if repair fixes it.
 #

diff --git a/tests/xfs/885.out b/tests/xfs/340.out
similarity index 82%
rename from tests/xfs/885.out
rename to tests/xfs/340.out
index 8bfd9b37002210b049035f5776365a05c3d8b5a4..2f1e411080bdf898d4fa02d2e5997d1627d5288b 100644 (file)
--- a/tests/xfs/885.out
+++ b/tests/xfs/340.out
@@ -1,4 +1,4 @@
-QA output created by 885
+QA output created by 340
 Format and mount
 Create some files
 Corrupt fs

diff --git a/tests/xfs/886 b/tests/xfs/341
similarity index 99%
rename from tests/xfs/886
rename to tests/xfs/341
index 59704c79799c8a6f2ad36425da213d6a060657a7..8a47b77f6c7ea87cd17b1b5e1d9fffb51a8b1f83 100755 (executable)
--- a/tests/xfs/886
+++ b/tests/xfs/341
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 886
+# FS QA Test No. 341
 #
 # Cross-link file block into rtrmapbt and see if repair fixes it.
 #

diff --git a/tests/xfs/886.out b/tests/xfs/341.out
similarity index 82%
rename from tests/xfs/886.out
rename to tests/xfs/341.out
index 7f00c5de43a2741beb4227ee8254d40b7c5cd53a..75a5bc6c61191af6c2366e318bb80cde3fb5a1be 100644 (file)
--- a/tests/xfs/886.out
+++ b/tests/xfs/341.out
@@ -1,4 +1,4 @@
-QA output created by 886
+QA output created by 341
 Format and mount
 Create some files
 Corrupt fs

diff --git a/tests/xfs/887 b/tests/xfs/342
similarity index 99%
rename from tests/xfs/887
rename to tests/xfs/342
index 9a14543192e29a12d70d754d50b7587d6cdb0395..e0d2f3334994852147d73451cb857fcb6161168a 100755 (executable)
--- a/tests/xfs/887
+++ b/tests/xfs/342
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 887
+# FS QA Test No. 342
 #
 # Cross-link rtrmapbt block into a file and see if repair fixes it.
 #

diff --git a/tests/xfs/887.out b/tests/xfs/342.out
similarity index 82%
rename from tests/xfs/887.out
rename to tests/xfs/342.out
index 30cf0321314fbc5c0146fd66ec4812999d8b913b..340ab9d7a84a12d0e2b0fbc5709b1aaf2b0e72b6 100644 (file)
--- a/tests/xfs/887.out
+++ b/tests/xfs/342.out
@@ -1,4 +1,4 @@
-QA output created by 887
+QA output created by 342
 Format and mount
 Create some files
 Corrupt fs

diff --git a/tests/xfs/888 b/tests/xfs/343
similarity index 99%
rename from tests/xfs/888
rename to tests/xfs/343
index 2441bfdd467285169c89d1190d796ed7239bc9f4..19b3c8c90126db9c0a3c7cf6cc999ef2b5f106da 100755 (executable)
--- a/tests/xfs/888
+++ b/tests/xfs/343
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 888
+# FS QA Test No. 343
 #
 # Basic rmap manipulation tests for realtime files.
 #

diff --git a/tests/xfs/888.out b/tests/xfs/343.out
similarity index 81%
rename from tests/xfs/888.out
rename to tests/xfs/343.out
index 2587697b0744264fac3cc2ccf548c65bc66b5952..b26afd5b8d2c80bc197e5c44cf7d276ffc7e297f 100644 (file)
--- a/tests/xfs/888.out
+++ b/tests/xfs/343.out
@@ -1,4 +1,4 @@
-QA output created by 888
+QA output created by 343
 Format and mount
 Create some files
 Manipulate file

diff --git a/tests/xfs/897 b/tests/xfs/344
similarity index 99%
rename from tests/xfs/897
rename to tests/xfs/344
index e7da5c0cd268d50625a240b760edcc99934e99d6..25bff1af0fecb729eb25563c6feff606a76766ea 100755 (executable)
--- a/tests/xfs/897
+++ b/tests/xfs/344
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 897
+# FS QA Test No. 344
 #
 # Test fragmentation after a lot of random CoW:
 # - Create two reflinked files.  Set zero extsz hint on second file.

diff --git a/tests/xfs/344.out b/tests/xfs/344.out
new file mode 100644 (file)
index 0000000..50fffc9
--- /dev/null
+++ b/tests/xfs/344.out
@@ -0,0 +1,10 @@
+QA output created by 344
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-344/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-344/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-344/file1
+Check extent counts

diff --git a/tests/xfs/898 b/tests/xfs/345
similarity index 99%
rename from tests/xfs/898
rename to tests/xfs/345
index aa62ee26e433feac847ef0f86c3284e148792cea..edb4443fafb0acb3e6b21648ddad83eba079f9d5 100755 (executable)
--- a/tests/xfs/898
+++ b/tests/xfs/345
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 898
+# FS QA Test No. 345
 #
 # Test fragmentation after a lot of random CoW:
 # - Create two reflinked files.  Set zero extsz hint on second file.

diff --git a/tests/xfs/345.out b/tests/xfs/345.out
new file mode 100644 (file)
index 0000000..ebb90b4
--- /dev/null
+++ b/tests/xfs/345.out
@@ -0,0 +1,10 @@
+QA output created by 345
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-345/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-345/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-345/file1
+Check extent counts

diff --git a/tests/xfs/899 b/tests/xfs/346
similarity index 99%
rename from tests/xfs/899
rename to tests/xfs/346
index 0eea9151e97f83254c1d16ee157f7b3ee5d4d808..d0463eb503ba6ff46b3fa888ac99b3d1488e92c6 100755 (executable)
--- a/tests/xfs/899
+++ b/tests/xfs/346
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 899
+# FS QA Test No. 346
 #
 # Test fragmentation after writing and dropping CoW extent hint reservation:
 # - Create two reflinked files.  Set extsz hint on second file.

diff --git a/tests/xfs/346.out b/tests/xfs/346.out
new file mode 100644 (file)
index 0000000..17d2c4e
--- /dev/null
+++ b/tests/xfs/346.out
@@ -0,0 +1,10 @@
+QA output created by 346
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-346/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-346/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-346/file1
+Check extent counts

diff --git a/tests/xfs/900 b/tests/xfs/347
similarity index 99%
rename from tests/xfs/900
rename to tests/xfs/347
index 659ca23e4bae2b2de261950e7a03a2860b296d39..15782168ab94ee635737f4c50159470fadf50e6e 100755 (executable)
--- a/tests/xfs/900
+++ b/tests/xfs/347
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 900
+# FS QA Test No. 347
 #
 # Test fragmentation after writing and dropping CoW extent hint reservation:
 # - Create two reflinked files.  Set extsz hint on second file.

diff --git a/tests/xfs/347.out b/tests/xfs/347.out
new file mode 100644 (file)
index 0000000..08c1e0e
--- /dev/null
+++ b/tests/xfs/347.out
@@ -0,0 +1,10 @@
+QA output created by 347
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-347/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-347/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-347/file1
+Check extent counts

diff --git a/tests/xfs/897.out b/tests/xfs/897.out
deleted file mode 100644 (file)
index b418552..0000000
--- a/tests/xfs/897.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 897
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-897/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-897/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-897/file1
-Check extent counts

diff --git a/tests/xfs/898.out b/tests/xfs/898.out
deleted file mode 100644 (file)
index e50bb3b..0000000
--- a/tests/xfs/898.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 898
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-898/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-898/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-898/file1
-Check extent counts

diff --git a/tests/xfs/899.out b/tests/xfs/899.out
deleted file mode 100644 (file)
index fd3d7fe..0000000
--- a/tests/xfs/899.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 899
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-899/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-899/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-899/file1
-Check extent counts

diff --git a/tests/xfs/900.out b/tests/xfs/900.out
deleted file mode 100644 (file)
index 5ebf3e9..0000000
--- a/tests/xfs/900.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 900
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-900/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-900/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-900/file1
-Check extent counts

diff --git a/tests/xfs/group b/tests/xfs/group
index 02e34dc198bca77b03f9520dd0f13416d72330f3..3296eb984cc897fef0f323c5ae156289686c9096 100644 (file)
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -316,20 +316,20 @@
 328 auto quick clone fsr
 329 auto quick clone fsr
 330 auto quick clone fsr quota
-876 auto quick rmap clone
-877 auto quick rmap clone
-878 auto quick rmap
-879 auto quick rmap
-880 auto rmap
-881 auto rmap
-882 fuzzers rmap
-883 auto quick rmap
-884 auto quick rmap
-885 auto quick rmap
-886 auto quick rmap
-887 auto quick rmap
-888 auto quick rmap
-897 auto quick clone
-898 auto quick clone
-899 auto quick clone
-900 auto quick clone
+331 auto quick rmap clone
+332 auto quick rmap clone
+333 auto quick rmap
+334 auto quick rmap
+335 auto rmap
+336 auto rmap
+337 fuzzers rmap
+338 auto quick rmap
+339 auto quick rmap
+340 auto quick rmap
+341 auto quick rmap
+342 auto quick rmap
+343 auto quick rmap
+344 auto quick clone
+345 auto quick clone
+346 auto quick clone
+347 auto quick clone