Skip to contentSkip to conversation

xfstests: cleanup tests btrfs/030 and btrfs/034

PATCH New Filipe David Borba Manana 1 participant 1 message Feb 17, 2014 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests: cleanup tests btrfs/030 and btrfs/034

As recently suggested by Dave Chinner, make use of the new function named _run_btrfs_util_prog() to run the btrfs util program, and stop using run_check for running xfs_io - instead filter xfs_io's output and add it to the golden output.

---

Note: this patch depends on the version 3 of the patch titled:
"xfstests: add regression test for btrfs incremental send"

 tests/btrfs/030     |   14 +-
 tests/btrfs/034     |   28 +-
 tests/btrfs/034.out | 1880 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1899 insertions(+), 23 deletions(-)
tests/btrfs/030 +6 -8
index 6b52a0d..a9f5fb4 100755
@@ -109,8 +109,7 @@ echo "ola" > $SCRATCH_MNT/a/b/bar1/bar2/bar3/bar4/hello.txt
 #                      |-- bar4          (ino 275)
 #                           |--hello.txt (ino 276)
 
-run_check $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
-    $SCRATCH_MNT/mysnap1
+_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1
 
 echo " world" >> $SCRATCH_MNT/a/b/c/file.txt
 mv $SCRATCH_MNT/a/b/c/d $SCRATCH_MNT/a/b/c2/d2
@@ -164,15 +163,14 @@ mv $SCRATCH_MNT/a/b/bar1 $SCRATCH_MNT/a/b/k44/bar3/bar2/k11
 #                   |-- bar2/               (ino 273)
 #                        |-- k11/           (ino 272)
 
-run_check $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
-    $SCRATCH_MNT/mysnap2
+_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2
 
 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1
 run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \
     $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
 
 _scratch_unmount
@@ -180,10 +178,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
 run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 2>> $seqres.full
 
-run_check $BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $tmp/2.snap
+_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap
 run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 2>> $seqres.full
 
 _scratch_unmount
tests/btrfs/034 +13 -15
index db792de..38952a3 100755
@@ -56,27 +56,25 @@ _scratch_mount
 # detection was not correct, leading to data corruption by overriding latest
 # data regions of a file with zeroes.
 
-run_check $XFS_IO_PROG -f -c "truncate 104857600" $SCRATCH_MNT/foo
+$XFS_IO_PROG -f -c "truncate 104857600" $SCRATCH_MNT/foo
 
 for ((i = 0; i < 940; i++))
 do
-    OFFSET=$((32768 + i * 8192))
-    LEN=$((OFFSET + 8192))
-    run_check $XFS_IO_PROG -c "falloc -k $OFFSET $LEN" $SCRATCH_MNT/foo
-    run_check $XFS_IO_PROG -c "pwrite -S 0xf0 $OFFSET 4096" $SCRATCH_MNT/foo
+	OFFSET=$((32768 + i * 8192))
+	LEN=$((OFFSET + 8192))
+	$XFS_IO_PROG -c "falloc -k $OFFSET $LEN" $SCRATCH_MNT/foo
+	$XFS_IO_PROG -c "pwrite -S 0xf0 $OFFSET 4096" \
+		$SCRATCH_MNT/foo | _filter_xfs_io
 done
 
-run_check $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
-    $SCRATCH_MNT/mysnap1
+_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1
 
-run_check $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
-run_check $XFS_IO_PROG -c "truncate 3882008" $SCRATCH_MNT/foo
+$XFS_IO_PROG -c "truncate 3882008" $SCRATCH_MNT/foo
 
-run_check $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
-    $SCRATCH_MNT/mysnap2
+_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
 
 md5sum $SCRATCH_MNT/foo | _filter_scratch
@@ -88,10 +86,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
tests/btrfs/034.out +1880 -0

1,884 lines not on this page · raw message

Signature · 1 line
1.7.9.5