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
+16 -17
View File
@@ -22,7 +22,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"
@@ -34,8 +34,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
cd /
umount "$SCRATCH_MNT" > /dev/null 2>&1
rm -rf "$tmp".* "$testdir" "$metadump_file" "$TEST_DIR/image"
umount $SCRATCH_MNT > /dev/null 2>&1
rm -rf $tmp.* $testdir $metadump_file $TEST_DIR/image
}
# get standard environment, filters and checks
@@ -49,39 +49,38 @@ _supported_fs xfs
_require_loop
_require_scratch_reflink
rm -f "$seqres.full"
rm -f $seqres.full
_scratch_mkfs >/dev/null 2>&1
_scratch_mount
testdir="$SCRATCH_MNT/test-$seq"
rm -rf "$testdir"
mkdir "$testdir"
metadump_file="$TEST_DIR/${seq}_metadump"
testdir=$SCRATCH_MNT/test-$seq
mkdir $testdir
metadump_file=$TEST_DIR/${seq}_metadump
echo "Create the original file blocks"
blksz="$(stat -f "$testdir" -c '%S')"
blksz="$(stat -f $testdir -c '%S')"
nr_blks=$((4 * blksz / 12))
_pwrite_byte 0x61 0 $((blksz * nr_blks)) "$testdir/file1" >> "$seqres.full"
_pwrite_byte 0x61 0 $((blksz * nr_blks)) $testdir/file1 >> $seqres.full
echo "Reflink every other block"
seq 1 2 $((nr_blks - 1)) | while read nr; do
_reflink_range "$testdir/file1" $((nr * blksz)) \
"$testdir/file2" $((nr * blksz)) $blksz >> "$seqres.full"
_reflink_range $testdir/file1 $((nr * blksz)) \
$testdir/file2 $((nr * blksz)) $blksz >> $seqres.full
done
echo "Create metadump file"
_scratch_unmount
_scratch_metadump "$metadump_file"
_scratch_metadump $metadump_file
# Now restore the obfuscated one back and take a look around
echo "Restore metadump"
xfs_mdrestore "$metadump_file" "$TEST_DIR/image"
_mount -t $FSTYP "$TEST_DIR/image" "$SCRATCH_MNT"
umount "$SCRATCH_MNT"
xfs_mdrestore $metadump_file $TEST_DIR/image
_mount -t $FSTYP $TEST_DIR/image $SCRATCH_MNT
umount $SCRATCH_MNT
echo "Check restored fs"
_check_generic_filesystem "$metadump_file"
_check_generic_filesystem $metadump_file
# success, all done
status=0