mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
btrfs: cleanup tests 004, 007, 022 and 025
As recently suggested by Dave Chinner, make use of the new function named _run_btrfs_util_prog() to run the btrfs util program. Filipe David Borba Manana have cleaned up btrfs/030 and btrfs/034. I have done the same for the rest ones. Signed-off-by: Zhang Zhen <zhenzhang.zhang@huawei.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
+10
-10
@@ -55,25 +55,25 @@ _scratch_mkfs >/dev/null 2>&1
|
||||
_scratch_mount
|
||||
|
||||
run_check $XFS_IO_PROG -f -c "truncate 819200" $SCRATCH_MNT/foo
|
||||
run_check $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
|
||||
_run_btrfs_util_prog filesystem sync $SCRATCH_MNT
|
||||
|
||||
run_check $XFS_IO_PROG -c "falloc -k 819200 667648" $SCRATCH_MNT/foo
|
||||
run_check $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
|
||||
_run_btrfs_util_prog filesystem sync $SCRATCH_MNT
|
||||
|
||||
run_check $XFS_IO_PROG -c "pwrite 1482752 2978" $SCRATCH_MNT/foo
|
||||
run_check $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
|
||||
_run_btrfs_util_prog filesystem sync $SCRATCH_MNT
|
||||
|
||||
run_check $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
|
||||
_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \
|
||||
$SCRATCH_MNT/mysnap1
|
||||
|
||||
run_check $XFS_IO_PROG -c "truncate 883305" $SCRATCH_MNT/foo
|
||||
run_check $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
|
||||
_run_btrfs_util_prog filesystem sync $SCRATCH_MNT
|
||||
|
||||
run_check $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
|
||||
_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \
|
||||
$SCRATCH_MNT/mysnap2
|
||||
|
||||
run_check $BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap
|
||||
run_check $BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
|
||||
_run_btrfs_util_prog send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap
|
||||
_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
|
||||
-f $tmp/2.snap 2>&1
|
||||
|
||||
md5sum $SCRATCH_MNT/foo | _filter_scratch
|
||||
@@ -85,10 +85,10 @@ _check_btrfs_filesystem $SCRATCH_DEV
|
||||
_scratch_mkfs >/dev/null 2>&1
|
||||
_scratch_mount
|
||||
|
||||
run_check $BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $tmp/1.snap
|
||||
_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/1.snap
|
||||
md5sum $SCRATCH_MNT/mysnap1/foo | _filter_scratch
|
||||
|
||||
run_check $BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $tmp/2.snap
|
||||
_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap
|
||||
md5sum $SCRATCH_MNT/mysnap2/foo | _filter_scratch
|
||||
|
||||
_scratch_unmount
|
||||
|
||||
Reference in New Issue
Block a user