apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

reflink: fix style problems in existing tests

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
tests/generic/139
+49 -49
View File
@@ -23,8 +23,8 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
seq=`basename "$0"`
seqres="$RESULT_DIR/$seq"
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -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
@@ -48,7 +48,7 @@ _supported_os Linux
_require_test_reflink
_require_cp_reflink
rm -f "$seqres.full"
rm -f $seqres.full
testdir=$TEST_DIR/test-$seq
rm -rf $testdir
@@ -56,94 +56,94 @@ mkdir $testdir
echo "Create the original files"
blksz=65536
_pwrite_byte 0x61 0 $((blksz * 48 - 3)) "$testdir/file1" >> "$seqres.full"
_cp_reflink "$testdir/file1" "$testdir/file2" >> "$seqres.full"
_pwrite_byte 0x61 0 $((blksz * 48 - 3)) "$testdir/file3" >> "$seqres.full"
_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full
_cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
_test_remount
echo "Compare files"
md5sum "$testdir/file1" | _filter_test_dir
md5sum "$testdir/file2" | _filter_test_dir
md5sum "$testdir/file3" | _filter_test_dir
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
md5sum $testdir/file3 | _filter_test_dir
cmp -s "$testdir/file1" "$testdir/file2" || echo "Files 1-2 should match"
cmp -s "$testdir/file1" "$testdir/file3" || echo "Files 1-3 should match"
cmp -s "$testdir/file2" "$testdir/file3" || echo "Files 2-3 should match"
cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should match"
cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should match"
cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match"
echo "directio CoW the second file"
_pwrite_byte 0x62 0 $blksz "$testdir/file2" -d >> "$seqres.full"
_pwrite_byte 0x62 0 $blksz "$testdir/file3" -d >> "$seqres.full"
_pwrite_byte 0x62 0 $blksz $testdir/file2 -d >> $seqres.full
_pwrite_byte 0x62 0 $blksz $testdir/file3 -d >> $seqres.full
_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 "$testdir/file2" -d >> "$seqres.full"
_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 "$testdir/file3" -d >> "$seqres.full"
_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file2 -d >> $seqres.full
_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file3 -d >> $seqres.full
_pwrite_byte 0x62 $((blksz * 48)) $blksz "$testdir/file2" -d >> "$seqres.full"
_pwrite_byte 0x62 $((blksz * 48)) $blksz "$testdir/file3" -d >> "$seqres.full"
_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file2 -d >> $seqres.full
_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file3 -d >> $seqres.full
_test_remount
echo "Compare files"
md5sum "$testdir/file1" | _filter_test_dir
md5sum "$testdir/file2" | _filter_test_dir
md5sum "$testdir/file3" | _filter_test_dir
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
md5sum $testdir/file3 | _filter_test_dir
cmp -s "$testdir/file1" "$testdir/file2" || echo "Files 1-2 should not match (intentional)"
cmp -s "$testdir/file1" "$testdir/file3" || echo "Files 1-3 should not match (intentional)"
cmp -s "$testdir/file2" "$testdir/file3" || echo "Files 2-3 should match"
cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should not match (intentional)"
cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should not match (intentional)"
cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match"
echo "Compare the CoW'd section to the before file"
_compare_range "$testdir/file1" 0 "$testdir/file2" 0 $blksz \
_compare_range $testdir/file1 0 $testdir/file2 0 $blksz \
|| echo "Start sections do not match (intentional)"
_compare_range "$testdir/file1" $((blksz * 16 - 512)) \
"$testdir/file2" $((blksz * 16 - 512)) 512 \
_compare_range $testdir/file1 $((blksz * 16 - 512)) \
$testdir/file2 $((blksz * 16 - 512)) 512 \
|| echo "Middle sections do not match (intentional)"
_compare_range "$testdir/file1" $((blksz * 48 - 512)) \
"$testdir/file2" $((blksz * 48 - 512)) $blksz \
_compare_range $testdir/file1 $((blksz * 48 - 512)) \
$testdir/file2 $((blksz * 48 - 512)) $blksz \
|| echo "End sections do not match (intentional)"
echo "Compare the CoW'd section to the after file"
_compare_range "$testdir/file2" 0 "$testdir/file3" 0 $blksz \
_compare_range $testdir/file2 0 $testdir/file3 0 $blksz \
|| echo "Start sections do not match"
_compare_range "$testdir/file2" $((blksz * 16 - 512)) \
"$testdir/file3" $((blksz * 16 - 512)) 512 \
_compare_range $testdir/file2 $((blksz * 16 - 512)) \
$testdir/file3 $((blksz * 16 - 512)) 512 \
|| echo "Middle sections do not match"
_compare_range "$testdir/file2" $((blksz * 48 - 512)) \
"$testdir/file3" $((blksz * 48 - 512)) $blksz \
_compare_range $testdir/file2 $((blksz * 48 - 512)) \
$testdir/file3 $((blksz * 48 - 512)) $blksz \
|| echo "End sections do not match"
echo "Compare the not CoW'd sections"
_compare_range "$testdir/file1" $blksz "$testdir/file2" $blksz 512 \
_compare_range $testdir/file1 $blksz $testdir/file2 $blksz 512 \
|| echo "Start sections of 1-2 do not match"
_compare_range "$testdir/file2" $blksz "$testdir/file3" $blksz 512 \
_compare_range $testdir/file2 $blksz $testdir/file3 $blksz 512 \
|| echo "Start sections of 2-3 do not match"
_compare_range "$testdir/file1" $((blksz * 16 - 1024)) \
"$testdir/file2" $((blksz * 16 - 1024)) 512 \
_compare_range $testdir/file1 $((blksz * 16 - 1024)) \
$testdir/file2 $((blksz * 16 - 1024)) 512 \
|| echo "Middle sections of 1-2 do not match"
_compare_range "$testdir/file2" $((blksz * 16 - 1024)) \
"$testdir/file3" $((blksz * 16 - 1024)) 512 \
_compare_range $testdir/file2 $((blksz * 16 - 1024)) \
$testdir/file3 $((blksz * 16 - 1024)) 512 \
|| echo "Middle sections of 2-3 do not match"
_compare_range "$testdir/file1" $((blksz * 48 - 1024)) \
"$testdir/file2" $((blksz * 48 - 1024)) 512 \
_compare_range $testdir/file1 $((blksz * 48 - 1024)) \
$testdir/file2 $((blksz * 48 - 1024)) 512 \
|| echo "End sections of 1-2 do not match"
_compare_range "$testdir/file2" $((blksz * 48 - 1024)) \
"$testdir/file3" $((blksz * 48 - 1024)) 512 \
_compare_range $testdir/file2 $((blksz * 48 - 1024)) \
$testdir/file3 $((blksz * 48 - 1024)) 512 \
|| echo "End sections of 2-3 do not match"
_compare_range "$testdir/file1" $((blksz * 16)) \
"$testdir/file2" $((blksz * 16)) 512 \
_compare_range $testdir/file1 $((blksz * 16)) \
$testdir/file2 $((blksz * 16)) 512 \
|| echo "Untouched sections of 1-2 do not match"
_compare_range "$testdir/file2" $((blksz * 16)) \
"$testdir/file3" $((blksz * 16)) 512 \
_compare_range $testdir/file2 $((blksz * 16)) \
$testdir/file3 $((blksz * 16)) 512 \
|| echo "Untouched sections of 2-3 do not match"
# success, all done