reflink: fix style problems in existing tests

Fix style problems such as unnecessary use of quotes, add helper
variables to reduce visual clutter, and other minor fixes to make the
first batch of tests more closely resemble the second round tests.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Darrick J. Wong
2016-02-10 00:33:10 -08:00
parent 96de24c84a
commit 2616587012
87 changed files with 2159 additions and 2143 deletions
+21 -21
View File
@@ -23,7 +23,7 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
seq=`basename "$0"`
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
cd /
rm -rf "$tmp".* "$testdir"
rm -rf $tmp.* $testdir
}
# get standard environment, filters and checks
@@ -47,44 +47,44 @@ _cleanup()
_supported_os Linux
_require_test_reflink
rm -f "$seqres.full"
rm -f $seqres.full
testdir="$TEST_DIR/test-$seq"
rm -rf "$testdir"
mkdir "$testdir"
testdir=$TEST_DIR/test-$seq
rm -rf $testdir
mkdir $testdir
echo "Create the original files"
blksz=65536
_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) "$testdir/file1" >> "$seqres.full"
_pwrite_byte 0x62 $((blksz * 2)) $((blksz * 6)) "$testdir/file2" >> "$seqres.full"
_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file1 >> $seqres.full
_pwrite_byte 0x62 $((blksz * 2)) $((blksz * 6)) $testdir/file2 >> $seqres.full
_test_remount
md5sum "$testdir/file1" | _filter_test_dir
md5sum "$testdir/file2" | _filter_test_dir
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
_compare_range "$testdir/file1" 0 "$testdir/file2" 0 $((blksz * 8)) \
_compare_range $testdir/file1 0 $testdir/file2 0 $((blksz * 8)) \
|| echo "Files do not match (intentional)"
echo "Reflink the middle blocks together"
free_before="$(stat -f -c '%a' "$testdir")"
_reflink_range "$testdir/file1" $((blksz * 4)) "$testdir/file2" \
$((blksz * 4)) $((blksz * 2)) >> "$seqres.full"
free_before=$(stat -f -c '%a' $testdir)
_reflink_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
$((blksz * 4)) $((blksz * 2)) >> $seqres.full
_test_remount
free_after="$(stat -f -c '%a' "$testdir")"
echo "freesp changed by $free_before -> $free_after" >> "$seqres.full"
free_after=$(stat -f -c '%a' $testdir)
echo "freesp changed by $free_before -> $free_after" >> $seqres.full
echo "Compare sections"
md5sum "$testdir/file1" | _filter_test_dir
md5sum "$testdir/file2" | _filter_test_dir
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
_compare_range "$testdir/file1" 0 "$testdir/file2" 0 $((blksz * 4)) \
_compare_range $testdir/file1 0 $testdir/file2 0 $((blksz * 4)) \
|| echo "Start sections do not match (intentional)"
_compare_range "$testdir/file1" $((blksz * 4)) "$testdir/file2" \
_compare_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
$((blksz * 4)) $((blksz * 2)) \
|| echo "Middle sections do not match"
_compare_range "$testdir/file1" $((blksz * 6)) "$testdir/file2" \
_compare_range $testdir/file1 $((blksz * 6)) $testdir/file2 \
$((blksz * 6)) $((blksz * 2)) \
|| echo "End sections do not match (intentional)"