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/158
+31 -31
View File
@@ -20,8 +20,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`
@@ -32,7 +32,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
cd /
rm -rf "$tmp".* "$testdir1"
rm -rf $tmp.* $testdir1
}
# get standard environment, filters and checks
@@ -46,19 +46,18 @@ _supported_os Linux
_require_test_dedupe
_require_scratch_dedupe
rm -f "$seqres.full"
rm -f $seqres.full
echo "Format and mount"
_scratch_mkfs > "$seqres.full" 2>&1
_scratch_mount >> "$seqres.full" 2>&1
_scratch_mkfs > $seqres.full 2>&1
_scratch_mount >> $seqres.full 2>&1
testdir1="$TEST_DIR/test-$seq"
rm -rf "$testdir1"
mkdir "$testdir1"
rm -rf $testdir1
mkdir $testdir1
testdir2=$SCRATCH_MNT/test-$seq
rm -rf "$testdir2"
mkdir "$testdir2"
mkdir $testdir2
echo "Create the original files"
blksz="$(stat -f $testdir1 -c '%S')"
@@ -67,17 +66,18 @@ margin='7%'
sz=$((blksz * blks))
free_blocks0=$(stat -f $testdir1 -c '%f')
nr=4
_pwrite_byte 0x61 0 $sz "$testdir1/file1" >> "$seqres.full"
_pwrite_byte 0x61 0 $sz "$testdir1/file2" >> "$seqres.full"
_pwrite_byte 0x61 0 $sz "$testdir1/file3" >> "$seqres.full"
_pwrite_byte 0x61 0 $sz "$testdir2/file1" >> "$seqres.full"
_pwrite_byte 0x61 0 $sz "$testdir2/file2" >> "$seqres.full"
mkdir "$testdir1/dir1"
filesize=$((blksz * nr))
_pwrite_byte 0x61 0 $sz $testdir1/file1 >> $seqres.full
_pwrite_byte 0x61 0 $sz $testdir1/file2 >> $seqres.full
_pwrite_byte 0x61 0 $sz $testdir1/file3 >> $seqres.full
_pwrite_byte 0x61 0 $sz $testdir2/file1 >> $seqres.full
_pwrite_byte 0x61 0 $sz $testdir2/file2 >> $seqres.full
mkdir $testdir1/dir1
seq 1 $((2 * blksz / 250)) | while read f; do
touch "$testdir1/dir1/$f"
touch $testdir1/dir1/$f
done
mknod "$testdir1/dev1" c 1 3
mkfifo "$testdir1/fifo1"
mknod $testdir1/dev1 c 1 3
mkfifo $testdir1/fifo1
sync
_filter_enotty() {
@@ -89,38 +89,38 @@ _filter_eperm() {
}
echo "Try cross-device dedupe"
_dedupe_range "$testdir1/file1" 0 "$testdir2/file1" 0 $blksz
_dedupe_range $testdir1/file1 0 $testdir2/file1 0 $blksz
echo "Try unaligned dedupe"
_dedupe_range "$testdir1/file1" 37 "$testdir1/file1" 59 23
_dedupe_range $testdir1/file1 37 $testdir1/file1 59 23
echo "Try overlapping dedupe"
_dedupe_range "$testdir1/file1" 0 "$testdir1/file1" 1 $((blksz * 2))
_dedupe_range $testdir1/file1 0 $testdir1/file1 1 $((blksz * 2))
echo "Try dedupe past EOF"
_dedupe_range "$testdir1/file1" $(( (blks + 10) * blksz)) "$testdir1/file1" 0 $blksz
_dedupe_range $testdir1/file1 $(( (blks + 10) * blksz)) $testdir1/file1 0 $blksz
echo "Try to dedupe a dir"
_dedupe_range "$testdir1/dir1" 0 "$testdir1/file2" 0 $blksz
_dedupe_range $testdir1/dir1 0 $testdir1/file2 0 $blksz
echo "Try to dedupe a device"
_dedupe_range "$testdir1/dev1" 0 "$testdir1/file2" 0 $blksz 2>&1 | _filter_enotty
_dedupe_range $testdir1/dev1 0 $testdir1/file2 0 $blksz 2>&1 | _filter_enotty
echo "Try to dedupe to a dir"
_dedupe_range "$testdir1/file1" 0 "$testdir1/dir1" 0 $blksz 2>&1 | _filter_test_dir
_dedupe_range $testdir1/file1 0 $testdir1/dir1 0 $blksz 2>&1 | _filter_test_dir
echo "Try to dedupe to a device"
_dedupe_range "$testdir1/file1" 0 "$testdir1/dev1" 0 $blksz 2>&1 | _filter_eperm
_dedupe_range $testdir1/file1 0 $testdir1/dev1 0 $blksz 2>&1 | _filter_eperm
echo "Try to dedupe to a fifo"
_dedupe_range "$testdir1/file1" 0 "$testdir1/fifo1" 0 $blksz -n 2>&1 | _filter_eperm
_dedupe_range $testdir1/file1 0 $testdir1/fifo1 0 $blksz -n 2>&1 | _filter_eperm
echo "Try to dedupe an append-only file"
_dedupe_range "$testdir1/file1" 0 "$testdir1/file3" 0 $blksz -a >> "$seqres.full"
_dedupe_range $testdir1/file1 0 $testdir1/file3 0 $blksz -a >> $seqres.full
echo "Dedupe two files"
_dedupe_range "$testdir1/file1" 0 "$testdir1/file2" 0 $blksz >> "$seqres.full"
_dedupe_range "$testdir2/file1" 0 "$testdir2/file2" 0 $blksz >> "$seqres.full"
_dedupe_range $testdir1/file1 0 $testdir1/file2 0 $blksz >> $seqres.full
_dedupe_range $testdir2/file1 0 $testdir2/file2 0 $blksz >> $seqres.full
# success, all done
status=0