xfstests: restrict 259 device sizes to multiples of 512

Test 259 tries to make a loop device size which is 1 byte less
than 4T; losetup now warns that this makes little sense, and
the warning breaks the test output:

    +losetup: /mnt/test/259.image: warning: file does not fit into a 512-byte sector the end of the file will be ignored.

The RH QE testcase did originally use loopback, so did
not in effect test anything other than 512-multiple boundaries.

Just drop the non-512-byte-multiple cases, they produce
devices exactly the same size as their 512-byte-multiple
neighbors.

(FWIW, this is a regression test for the bug that
d943b11 mkfs: get size of device properly
fixed.)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/tests/xfs/259 b/tests/xfs/259
index 59eeacaa2fc22d43c2a07b8794d9e4dc1422f517..b8bd69a22eb483d71c9f1c51a811537270bd96a8 100755 (executable)
--- a/tests/xfs/259
+++ b/tests/xfs/259
@@ -48,7 +48,7 @@ testfile=$TEST_DIR/259.image
 
 # Test various sizes slightly less than 4 TB
 four_TB=$(_math "2^42")
-for del in 1 512 1024 1025 2048 4096; do
+for del in 512 1024 2048 4096; do
        ddseek=$(_math "$four_TB - $del")
        echo "Trying to make (4 TB - $del) B long xfs fs image"
        rm -f "$testfile"

diff --git a/tests/xfs/259.out b/tests/xfs/259.out
index 263bb1b68fb2510cb4d7dab8ba8c797299c484db..6e0be9a15e2f11803e171520c9543ec74562fe8b 100644 (file)
--- a/tests/xfs/259.out
+++ b/tests/xfs/259.out
@@ -1,7 +1,5 @@
 QA output created by 259
-Trying to make (4 TB - 1) B long xfs fs image
 Trying to make (4 TB - 512) B long xfs fs image
 Trying to make (4 TB - 1024) B long xfs fs image
-Trying to make (4 TB - 1025) B long xfs fs image
 Trying to make (4 TB - 2048) B long xfs fs image
 Trying to make (4 TB - 4096) B long xfs fs image