diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-01-31 13:35:55 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-01-31 13:35:55 +0100 |
| commit | 040b00ef19fb1bbc0f7d3e5bec6ff82e19a92d26 (patch) | |
| tree | 1b74af0fb8cb199c5aa8c351fdf020da04d11bb4 | |
| parent | 5b11cd01790473b1964a0f91eca5205dfdcae773 (diff) | |
| download | coreutils-040b00ef19fb1bbc0f7d3e5bec6ff82e19a92d26.tar.xz | |
tests: remove duplicate fiemap-perf test
* tests/cp/fiemap-perf: Copy block-comparing code from sparse-fiemap.
* tests/cp/sparse-fiemap: The same test was here, alongside a much
more involved test. Remove it, now that it is in its own file.
| -rwxr-xr-x | tests/cp/fiemap-perf | 4 | ||||
| -rwxr-xr-x | tests/cp/sparse-fiemap | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/tests/cp/fiemap-perf b/tests/cp/fiemap-perf index 6c588cbc5..bd8fab8d4 100755 --- a/tests/cp/fiemap-perf +++ b/tests/cp/fiemap-perf @@ -29,4 +29,8 @@ timeout 10 truncate -s1T f || framework_failure_ # Nothing can read (much less write) that many bytes in so little time. timeout 10 cp f f2 || fail=1 +# Ensure that the sparse file copied through fiemap has the same size +# in bytes as the original. +test $(stat --printf %s sparse) = $(stat --printf %s fiemap) || fail=1 + Exit $fail diff --git a/tests/cp/sparse-fiemap b/tests/cp/sparse-fiemap index b6b110390..aecf9d2bf 100755 --- a/tests/cp/sparse-fiemap +++ b/tests/cp/sparse-fiemap @@ -1,7 +1,7 @@ #!/bin/sh # Test cp --sparse=always through fiemap copy -# Copyright (C) 2010 Free Software Foundation, Inc. +# Copyright (C) 2010, 2011 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,17 +47,6 @@ else skip_test_ "insufficient mount/ext4 support" fi -# Create a 1TiB sparse file -dd if=/dev/zero of=sparse bs=1k count=1 seek=1G || framework_failure - -# It takes many minutes to copy this sparse file using the old method. -# By contrast, it takes far less than 1 second using FIEMAP-copy. -timeout 10 cp --sparse=always sparse fiemap || fail=1 - -# Ensure that the sparse file copied through fiemap has the same size -# in bytes as the original. -test $(stat --printf %s sparse) = $(stat --printf %s fiemap) || fail=1 - # ================================================= # Ensure that we exercise the FIEMAP-copying code enough # to provoke at least two iterations of the do...while loop |