btrfs: move btrfs reflink tests to generic

Move the cp --reflink tests from btrfs/ to generic/ since xfs now
supports that ioctl.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/btrfs/026.out b/tests/btrfs/026.out
deleted file mode 100644 (file)
index 3b90ff0..0000000
--- a/tests/btrfs/026.out
+++ /dev/null
@@ -1,16 +0,0 @@
-QA output created by 026
-Create the original file and reflink to copy1, copy2
-Original md5sums:
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-026/original
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-026/copy1
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-026/copy2
-Overwrite original file with new data
-md5sums after overwriting original:
-4a847a25439532bf48b68c9e9536ed5b  TEST_DIR/test-026/original
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-026/copy1
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-026/copy2
-Overwrite copy1 with different new data
-md5sums after overwriting copy1:
-4a847a25439532bf48b68c9e9536ed5b  TEST_DIR/test-026/original
-e271cd47d9f62ebc96cb4e67ae4d16db  TEST_DIR/test-026/copy1
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-026/copy2

diff --git a/tests/btrfs/027.out b/tests/btrfs/027.out
deleted file mode 100644 (file)
index 7b7e3bb..0000000
--- a/tests/btrfs/027.out
+++ /dev/null
@@ -1,25 +0,0 @@
-QA output created by 027
-Create the original files and reflink dirs
-Original md5sums:
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-027/original/file1
-ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-027/original/subdir/file2
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-027/copy1/file1
-ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-027/copy1/subdir/file2
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-027/copy2/file1
-ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-027/copy2/subdir/file2
-Overwrite original/file1 and original/subdir/file2 with new data
-md5sums now:
-260f6785c0537fd12582dcae28a3c1a9  TEST_DIR/test-027/original/file1
-b8d91fb600f6f2191f2ba66665374860  TEST_DIR/test-027/original/subdir/file2
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-027/copy1/file1
-ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-027/copy1/subdir/file2
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-027/copy2/file1
-ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-027/copy2/subdir/file2
-Overwrite copy1/file1 and copy1/subdir/file2 with new data
-md5sums now:
-260f6785c0537fd12582dcae28a3c1a9  TEST_DIR/test-027/original/file1
-b8d91fb600f6f2191f2ba66665374860  TEST_DIR/test-027/original/subdir/file2
-b20229a003e3985c4b0e6806abcd6642  TEST_DIR/test-027/copy1/file1
-b815b24069db14e0a3a07169fd563e93  TEST_DIR/test-027/copy1/subdir/file2
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-027/copy2/file1
-ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-027/copy2/subdir/file2

diff --git a/tests/btrfs/028.out b/tests/btrfs/028.out
deleted file mode 100644 (file)
index f683fce..0000000
--- a/tests/btrfs/028.out
+++ /dev/null
@@ -1,7 +0,0 @@
-QA output created by 028
-Create the original files and reflink dirs
-Move orig & reflink copy to subdir and md5sum:
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-028/subdir/original_moved
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-028/subdir/copy_moved
-remove orig from subdir and md5sum reflink copy:
-42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-028/subdir/copy_moved

diff --git a/tests/btrfs/group b/tests/btrfs/group
index 7cf7dd7b92a7fba15a96fed7f1f69396ea979db0..c5d529fec7d5da7cea95be1bd77c7ebfc5acfa48 100644 (file)
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -28,9 +28,6 @@
 023 auto
 024 auto quick compress
 025 auto quick send clone
-026 auto quick clone
-027 auto quick clone
-028 auto quick clone
 029 auto quick clone
 030 auto quick send
 031 auto quick subvol clone

diff --git a/tests/btrfs/026 b/tests/generic/110
similarity index 99%
rename from tests/btrfs/026
rename to tests/generic/110
index 7559ca270258491df81c99f7b98738eb5ef7d930..ec743577783ee998ed04640c161df06b9ad2813f 100755 (executable)
--- a/tests/btrfs/026
+++ b/tests/generic/110
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 026
+# FS QA Test No. 110
 #
 # Tests file clone functionality of btrfs ("reflinks"):
 #   - Reflink a file

diff --git a/tests/generic/110.out b/tests/generic/110.out
new file mode 100644 (file)
index 0000000..e58b9d8
--- /dev/null
+++ b/tests/generic/110.out
@@ -0,0 +1,16 @@
+QA output created by 110
+Create the original file and reflink to copy1, copy2
+Original md5sums:
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-110/original
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-110/copy1
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-110/copy2
+Overwrite original file with new data
+md5sums after overwriting original:
+4a847a25439532bf48b68c9e9536ed5b  TEST_DIR/test-110/original
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-110/copy1
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-110/copy2
+Overwrite copy1 with different new data
+md5sums after overwriting copy1:
+4a847a25439532bf48b68c9e9536ed5b  TEST_DIR/test-110/original
+e271cd47d9f62ebc96cb4e67ae4d16db  TEST_DIR/test-110/copy1
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-110/copy2

diff --git a/tests/btrfs/027 b/tests/generic/111
similarity index 99%
rename from tests/btrfs/027
rename to tests/generic/111
index d2b812bb10660eade018a0eac53385d53b1af660..9da3f40363ca1938bccd4a5e2d3fbb1787566013 100755 (executable)
--- a/tests/btrfs/027
+++ b/tests/generic/111
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 027
+# FS QA Test No. 111
 #
 # Tests file clone functionality of btrfs ("reflinks") on directory
 # trees.

diff --git a/tests/generic/111.out b/tests/generic/111.out
new file mode 100644 (file)
index 0000000..e410802
--- /dev/null
+++ b/tests/generic/111.out
@@ -0,0 +1,25 @@
+QA output created by 111
+Create the original files and reflink dirs
+Original md5sums:
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-111/original/file1
+ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-111/original/subdir/file2
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-111/copy1/file1
+ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-111/copy1/subdir/file2
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-111/copy2/file1
+ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-111/copy2/subdir/file2
+Overwrite original/file1 and original/subdir/file2 with new data
+md5sums now:
+260f6785c0537fd12582dcae28a3c1a9  TEST_DIR/test-111/original/file1
+b8d91fb600f6f2191f2ba66665374860  TEST_DIR/test-111/original/subdir/file2
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-111/copy1/file1
+ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-111/copy1/subdir/file2
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-111/copy2/file1
+ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-111/copy2/subdir/file2
+Overwrite copy1/file1 and copy1/subdir/file2 with new data
+md5sums now:
+260f6785c0537fd12582dcae28a3c1a9  TEST_DIR/test-111/original/file1
+b8d91fb600f6f2191f2ba66665374860  TEST_DIR/test-111/original/subdir/file2
+b20229a003e3985c4b0e6806abcd6642  TEST_DIR/test-111/copy1/file1
+b815b24069db14e0a3a07169fd563e93  TEST_DIR/test-111/copy1/subdir/file2
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-111/copy2/file1
+ca390545f0aedb54b808d6128c56a7dd  TEST_DIR/test-111/copy2/subdir/file2

diff --git a/tests/btrfs/028 b/tests/generic/115
similarity index 99%
rename from tests/btrfs/028
rename to tests/generic/115
index 7193337cc14d3c8c524bc5a3abc6ea6475b4e59a..35f0417a357b8d92117c87409efad03d6c5be08c 100755 (executable)
--- a/tests/btrfs/028
+++ b/tests/generic/115
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 028
+# FS QA Test No. 115
 #
 # Moving and deleting cloned ("reflinked") files on btrfs:
 #   - Create a file and a reflink

diff --git a/tests/generic/115.out b/tests/generic/115.out
new file mode 100644 (file)
index 0000000..a532214
--- /dev/null
+++ b/tests/generic/115.out
@@ -0,0 +1,7 @@
+QA output created by 115
+Create the original files and reflink dirs
+Move orig & reflink copy to subdir and md5sum:
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-115/subdir/original_moved
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-115/subdir/copy_moved
+remove orig from subdir and md5sum reflink copy:
+42d69d1a6d333a7ebdf64792a555e392  TEST_DIR/test-115/subdir/copy_moved

diff --git a/tests/generic/group b/tests/generic/group
index 1dd42698ee1a9d07383056fac3685d4f5dc9d361..aa31c8b874023b7e34960717850137a21f5953e0 100644 (file)
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -112,9 +112,12 @@
 107 auto quick metadata
 108 auto quick rw
 109 auto metadata dir
+110 auto quick clone
+111 auto quick clone
 112 rw aio auto quick
 113 rw aio auto quick
 114 rw aio auto quick
+115 auto quick clone
 117 attr auto quick
 120 other auto quick
 123 perms auto quick