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/136
+39 -39
View File
@@ -26,8 +26,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`
@@ -38,7 +38,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
@@ -50,48 +50,48 @@ _cleanup()
_supported_os Linux
_require_test_dedupe
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 0 $((blksz + 37)) "$testdir/file1" >> "$seqres.full"
_pwrite_byte 0x61 0 $((blksz + 37)) "$testdir/file2" >> "$seqres.full"
_pwrite_byte 0x62 0 $((blksz + 37)) "$testdir/file3" >> "$seqres.full"
_pwrite_byte 0x62 0 $((blksz + 37)) "$testdir/file4" >> "$seqres.full"
_pwrite_byte 0x61 0 $((blksz + 37)) $testdir/file1 >> $seqres.full
_pwrite_byte 0x61 0 $((blksz + 37)) $testdir/file2 >> $seqres.full
_pwrite_byte 0x62 0 $((blksz + 37)) $testdir/file3 >> $seqres.full
_pwrite_byte 0x62 0 $((blksz + 37)) $testdir/file4 >> $seqres.full
_test_remount
md5sum "$testdir/file1" | _filter_test_dir
md5sum "$testdir/file2" | _filter_test_dir
md5sum "$testdir/file3" | _filter_test_dir
md5sum "$testdir/file4" | _filter_test_dir
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
md5sum $testdir/file3 | _filter_test_dir
md5sum $testdir/file4 | _filter_test_dir
c1="$(_md5_checksum $testdir/file1)"
c2="$(_md5_checksum $testdir/file2)"
c3="$(_md5_checksum $testdir/file3)"
c4="$(_md5_checksum $testdir/file4)"
test "${c1}" = "${c2}" || echo "file1 and file2 should match"
test "${c1}" != "${c3}" || echo "file1 and file3 should not match"
test "${c1}" != "${c4}" || echo "file1 and file4 should not match"
test "${c2}" != "${c3}" || echo "file2 and file3 should not match"
test "${c2}" != "${c4}" || echo "file2 and file4 should not match"
test "${c3}" = "${c4}" || echo "file3 and file4 should match"
test ${c1} = ${c2} || echo "file1 and file2 should match"
test ${c1} != ${c3} || echo "file1 and file3 should not match"
test ${c1} != ${c4} || echo "file1 and file4 should not match"
test ${c2} != ${c3} || echo "file2 and file3 should not match"
test ${c2} != ${c4} || echo "file2 and file4 should not match"
test ${c3} = ${c4} || echo "file3 and file4 should match"
echo "Dedupe the last blocks together"
echo "1->2"
_dedupe_range "$testdir/file1" $blksz "$testdir/file2" $blksz 37 >> "$seqres.full"
_dedupe_range $testdir/file1 $blksz $testdir/file2 $blksz 37 >> $seqres.full
echo "1->3"
_dedupe_range "$testdir/file1" $blksz "$testdir/file3" $blksz 37 >> "$seqres.full"
_dedupe_range $testdir/file1 $blksz $testdir/file3 $blksz 37 >> $seqres.full
_test_remount
md5sum "$testdir/file1" | _filter_test_dir
md5sum "$testdir/file2" | _filter_test_dir
md5sum "$testdir/file3" | _filter_test_dir
md5sum "$testdir/file4" | _filter_test_dir
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
md5sum $testdir/file3 | _filter_test_dir
md5sum $testdir/file4 | _filter_test_dir
c1="$(_md5_checksum $testdir/file1)"
c2="$(_md5_checksum $testdir/file2)"
@@ -99,30 +99,30 @@ c3="$(_md5_checksum $testdir/file3)"
c4="$(_md5_checksum $testdir/file4)"
echo "Compare files"
test "${c1}" = "${c2}" || echo "file1 and file2 should match"
test "${c1}" != "${c3}" || echo "file1 and file3 should not match"
test "${c1}" != "${c4}" || echo "file1 and file4 should not match"
test "${c2}" != "${c3}" || echo "file2 and file3 should not match"
test "${c2}" != "${c4}" || echo "file2 and file4 should not match"
test "${c3}" = "${c4}" || echo "file3 and file4 should match"
test ${c1} = ${c2} || echo "file1 and file2 should match"
test ${c1} != ${c3} || echo "file1 and file3 should not match"
test ${c1} != ${c4} || echo "file1 and file4 should not match"
test ${c2} != ${c3} || echo "file2 and file3 should not match"
test ${c2} != ${c4} || echo "file2 and file4 should not match"
test ${c3} = ${c4} || echo "file3 and file4 should match"
echo "Compare sections"
_compare_range "$testdir/file1" $blksz "$testdir/file2" $blksz 37 \
_compare_range $testdir/file1 $blksz $testdir/file2 $blksz 37 \
|| echo "End sections of files 1-2 do not match"
_compare_range "$testdir/file1" $blksz "$testdir/file3" $blksz 37 \
_compare_range $testdir/file1 $blksz $testdir/file3 $blksz 37 \
|| echo "End sections of files 1-3 do not match (intentional)"
_compare_range "$testdir/file1" $blksz "$testdir/file4" $blksz 37 \
_compare_range $testdir/file1 $blksz $testdir/file4 $blksz 37 \
|| echo "End sections of files 1-4 do not match (intentional)"
_compare_range "$testdir/file2" $blksz "$testdir/file3" $blksz 37 \
_compare_range $testdir/file2 $blksz $testdir/file3 $blksz 37 \
|| echo "End sections of files 2-3 do not match (intentional)"
_compare_range "$testdir/file2" $blksz "$testdir/file4" $blksz 37 \
_compare_range $testdir/file2 $blksz $testdir/file4 $blksz 37 \
|| echo "End sections of files 2-4 do not match (intentional)"
_compare_range "$testdir/file3" $blksz "$testdir/file4" $blksz 37 \
_compare_range $testdir/file3 $blksz $testdir/file4 $blksz 37 \
|| echo "End sections of files 3-4 do not match"
# success, all done