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

xfstests: clean command names in btrfs tests

Browse Source 
- expand shortened command names
- use $BTRFS_UTIL_PROG instead of 'btrfs'
- fix test 024 header number

Signed-off-by: David Sterba <dsterba@suse.cz>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
David Sterba
2014-01-24 12:06:14 +11:00
committed by Dave Chinner
parent 586a06c5b9
commit 1ed9046c3f
14 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/btrfs/003
+1 -1
View File
@@ -148,7 +148,7 @@ _test_replace()
_devmgt_remove ${DEVHTL} $ds _devmgt_remove ${DEVHTL} $ds
dev_removed=1 dev_removed=1
$BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \ $BTRFS_UTIL_PROG filesystem show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \
"btrfs did not report device missing" "btrfs did not report device missing"
# add a new disk to btrfs # add a new disk to btrfs
tests/btrfs/004
+1 -1
View File
@@ -182,7 +182,7 @@ workout()
run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p $procs -n 2000 \ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p $procs -n 2000 \
$FSSTRESS_AVOID $FSSTRESS_AVOID
run_check $BTRFS_UTIL_PROG subvol snap $SCRATCH_MNT \ run_check $BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT \
$SCRATCH_MNT/$snap_name $SCRATCH_MNT/$snap_name
run_check umount $SCRATCH_DEV >/dev/null 2>&1 run_check umount $SCRATCH_DEV >/dev/null 2>&1
tests/btrfs/007
+2 -2
View File
@@ -72,9 +72,9 @@ workout()
run_check _scratch_mount "-o noatime" run_check _scratch_mount "-o noatime"
run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n $ops $FSSTRESS_AVOID -x \ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n $ops $FSSTRESS_AVOID -x \
"$BTRFS_UTIL_PROG subvol snap -r $SCRATCH_MNT $SCRATCH_MNT/base" "$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/base"
run_check $BTRFS_UTIL_PROG subvol snap -r $SCRATCH_MNT $SCRATCH_MNT/incr run_check $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/incr
echo "# $BTRFS_UTIL_PROG send $SCRATCH_MNT/base > $tmp/base.snap" \ echo "# $BTRFS_UTIL_PROG send $SCRATCH_MNT/base > $tmp/base.snap" \
>> $seqres.full >> $seqres.full
tests/btrfs/008
+6 -6
View File
@@ -34,9 +34,9 @@ status=1 # failure is the default!
_cleanup() _cleanup()
{ {
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/send/snapshots/backup2 > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/send/snapshots/backup2 > /dev/null 2>&1
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/send/snapshots/backup3 > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/send/snapshots/backup3 > /dev/null 2>&1
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/send > /dev/null 2>&1
rm -rf $TEST_DIR/$tmp_dir rm -rf $TEST_DIR/$tmp_dir
rm -f $tmp.* rm -f $tmp.*
} }
@@ -62,7 +62,7 @@ export SELINUX_MOUNT_OPTIONS=""
_scratch_mount _scratch_mount
mkdir $TEST_DIR/$tmp_dir mkdir $TEST_DIR/$tmp_dir
$BTRFS_UTIL_PROG subvol create $TEST_DIR/$tmp_dir/send \ $BTRFS_UTIL_PROG subvolume create $TEST_DIR/$tmp_dir/send \
> $seqres.full 2>&1 || _fail "failed subvol create" > $seqres.full 2>&1 || _fail "failed subvol create"
work_dir="$TEST_DIR/$tmp_dir/send" work_dir="$TEST_DIR/$tmp_dir/send"
mkdir $work_dir/testdir mkdir $work_dir/testdir
@@ -72,9 +72,9 @@ dd if=/dev/urandom of=$work_dir/testdir/aa count=16 > /dev/null 2>&1
dd if=/dev/urandom of=$work_dir/testdir/bb count=16 > /dev/null 2>&1 dd if=/dev/urandom of=$work_dir/testdir/bb count=16 > /dev/null 2>&1
mkdir $work_dir/snapshots mkdir $work_dir/snapshots
$BTRFS_UTIL_PROG sub snap -r $work_dir $work_dir/snapshots/backup2 \ $BTRFS_UTIL_PROG subvolume snapshot -r $work_dir $work_dir/snapshots/backup2 \
>> $seqres.full 2>&1 || _fail "failed backup2" >> $seqres.full 2>&1 || _fail "failed backup2"
$BTRFS_UTIL_PROG sub snap -r $work_dir $work_dir/snapshots/backup3 \ $BTRFS_UTIL_PROG subvolume snapshot -r $work_dir $work_dir/snapshots/backup3 \
>> $seqres.full 2>&1 || _fail "failed backup3" >> $seqres.full 2>&1 || _fail "failed backup3"
$BTRFS_UTIL_PROG send $work_dir/snapshots/backup3/ -f $TEST_DIR/$tmp_dir/blah \ $BTRFS_UTIL_PROG send $work_dir/snapshots/backup3/ -f $TEST_DIR/$tmp_dir/blah \
>> $seqres.full 2>&1 || _fail "send failed" >> $seqres.full 2>&1 || _fail "send failed"
tests/btrfs/009
+3 -3
View File
@@ -52,12 +52,12 @@ rm -f $seqres.full
_scratch_mkfs > /dev/null 2>&1 _scratch_mkfs > /dev/null 2>&1
_scratch_mount _scratch_mount
$BTRFS_UTIL_PROG sub create $SCRATCH_MNT/newvol >> $seqres.full 2>&1 \ $BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/newvol >> $seqres.full 2>&1 \
|| _fail "couldn't create subvol" || _fail "couldn't create subvol"
subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT newvol) subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT newvol)
$BTRFS_UTIL_PROG sub set-default $subvolid $SCRATCH_MNT >> $seqres.full 2>&1 \ $BTRFS_UTIL_PROG subvolume set-default $subvolid $SCRATCH_MNT >> $seqres.full 2>&1 \
|| _fail "couldn't set default" || _fail "couldn't set default"
$BTRFS_UTIL_PROG sub delete $SCRATCH_MNT/newvol >> $seqres.full 2>&1 $BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/newvol >> $seqres.full 2>&1
_scratch_unmount _scratch_unmount
_scratch_mount || _fail "mount should have succeeded" _scratch_mount || _fail "mount should have succeeded"
tests/btrfs/013
+1 -1
View File
@@ -72,7 +72,7 @@ _check_csum_error()
} }
$XFS_IO_PROG -f -c "falloc 0 1M" -c "pwrite 16k 8k" -c "fsync" \ $XFS_IO_PROG -f -c "falloc 0 1M" -c "pwrite 16k 8k" -c "fsync" \
$SCRATCH_MNT/foo > $seqres.full 2>&1 $SCRATCH_MNT/foo > $seqres.full 2>&1
$BTRFS_UTIL_PROG fi ba $SCRATCH_MNT >> $seqres.full 2>&1 || \ $BTRFS_UTIL_PROG filesystem balance $SCRATCH_MNT >> $seqres.full 2>&1 || \
_fail "balance failed" _fail "balance failed"
_scratch_unmount _scratch_unmount
_scratch_mount _scratch_mount
tests/btrfs/014
+3 -3
View File
@@ -33,8 +33,8 @@ _create_snapshot()
{ {
for i in $(seq 20) for i in $(seq 20)
do do
btrfs sub snapshot $SCRATCH_MNT $SCRATCH_MNT/snapshot0 >/dev/null $BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snapshot0 >/dev/null
btrfs sub delete $SCRATCH_MNT/snapshot0 >/dev/null $BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snapshot0 >/dev/null
done done
} }
@@ -42,7 +42,7 @@ _balance()
{ {
for i in $(seq 20) for i in $(seq 20)
do do
btrfs balance start $SCRATCH_MNT >/dev/null $BTRFS_UTIL_PROG balance start $SCRATCH_MNT >/dev/null
done done
} }
tests/btrfs/015
+1 -1
View File
@@ -54,7 +54,7 @@ _scratch_mkfs > /dev/null 2>&1
_scratch_mount -o ro _scratch_mount -o ro
_scratch_mount -o rw,remount _scratch_mount -o rw,remount
$BTRFS_UTIL_PROG sub snap $SCRATCH_MNT $SCRATCH_MNT/snap >> $seqres.full 2>&1 \ $BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap >> $seqres.full 2>&1 \
|| _fail "couldn't create snapshot" || _fail "couldn't create snapshot"
echo "Silence is golden" echo "Silence is golden"
tests/btrfs/016
+7 -7
View File
@@ -34,9 +34,9 @@ status=1 # failure is the default!
_cleanup() _cleanup()
{ {
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap > /dev/null 2>&1
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap1 > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap1 > /dev/null 2>&1
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/send > /dev/null 2>&1
rm -rf $TEST_DIR/$tmp_dir rm -rf $TEST_DIR/$tmp_dir
rm -f $tmp.* rm -f $tmp.*
} }
@@ -65,15 +65,15 @@ export SELINUX_MOUNT_OPTIONS=""
_scratch_mount _scratch_mount
mkdir $TEST_DIR/$tmp_dir mkdir $TEST_DIR/$tmp_dir
$BTRFS_UTIL_PROG subvol create $TEST_DIR/$tmp_dir/send \ $BTRFS_UTIL_PROG subvolume create $TEST_DIR/$tmp_dir/send \
> $seqres.full 2>&1 || _fail "failed subvol create" > $seqres.full 2>&1 || _fail "failed subvolume create"
dd if=/dev/urandom of=$TEST_DIR/$tmp_dir/send/foo bs=1M count=10 >> $seqres.full \ dd if=/dev/urandom of=$TEST_DIR/$tmp_dir/send/foo bs=1M count=10 >> $seqres.full \
2>&1 || _fail "dd failed" 2>&1 || _fail "dd failed"
$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ $BTRFS_UTIL_PROG subvolume snapshot -r $TEST_DIR/$tmp_dir/send \
$TEST_DIR/$tmp_dir/snap >> $seqres.full 2>&1 || _fail "failed snap" $TEST_DIR/$tmp_dir/snap >> $seqres.full 2>&1 || _fail "failed snap"
$XFS_IO_PROG -c "fpunch 1m 1m" $TEST_DIR/$tmp_dir/send/foo $XFS_IO_PROG -c "fpunch 1m 1m" $TEST_DIR/$tmp_dir/send/foo
$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ $BTRFS_UTIL_PROG subvolume snapshot -r $TEST_DIR/$tmp_dir/send \
$TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail "failed snap" $TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail "failed snap"
$FSSUM_PROG -A -f -w $tmp/fssum.snap $TEST_DIR/$tmp_dir/snap >> $seqres.full \ $FSSUM_PROG -A -f -w $tmp/fssum.snap $TEST_DIR/$tmp_dir/snap >> $seqres.full \
tests/btrfs/017
+1 -1
View File
@@ -54,7 +54,7 @@ _scratch_mkfs > /dev/null 2>&1
_scratch_mount -o ro _scratch_mount -o ro
_scratch_mount -o rw,remount _scratch_mount -o rw,remount
$BTRFS_UTIL_PROG sub snap $SCRATCH_MNT $SCRATCH_MNT/snap >> $seqres.full 2>&1 \ $BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap >> $seqres.full 2>&1 \
|| _fail "couldn't create snapshot" || _fail "couldn't create snapshot"
echo "Silence is golden" echo "Silence is golden"
tests/btrfs/019
+7 -7
View File
@@ -34,9 +34,9 @@ status=1 # failure is the default!
_cleanup() _cleanup()
{ {
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap1 > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap1 > /dev/null 2>&1
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap2 > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap2 > /dev/null 2>&1
$BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1 $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/send > /dev/null 2>&1
rm -rf $TEST_DIR/$tmp_dir rm -rf $TEST_DIR/$tmp_dir
rm -f $tmp.* rm -f $tmp.*
} }
@@ -62,8 +62,8 @@ export SELINUX_MOUNT_OPTIONS=""
_scratch_mount _scratch_mount
mkdir $TEST_DIR/$tmp_dir mkdir $TEST_DIR/$tmp_dir
$BTRFS_UTIL_PROG subvol create $TEST_DIR/$tmp_dir/send \ $BTRFS_UTIL_PROG subvolume create $TEST_DIR/$tmp_dir/send \
> $seqres.full 2>&1 || _fail "failed subvol create" > $seqres.full 2>&1 || _fail "failed subvolume create"
SEND_TEST_DIR=$TEST_DIR/$tmp_dir/send SEND_TEST_DIR=$TEST_DIR/$tmp_dir/send
@@ -73,7 +73,7 @@ touch $SEND_TEST_DIR/test/blah
mkdir $SEND_TEST_DIR/test/foo mkdir $SEND_TEST_DIR/test/foo
touch $SEND_TEST_DIR/test/foo/bar touch $SEND_TEST_DIR/test/foo/bar
$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ $BTRFS_UTIL_PROG subvolume snapshot -r $TEST_DIR/$tmp_dir/send \
$TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail "failed snap1" $TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail "failed snap1"
$BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send1.dump \ $BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send1.dump \
@@ -91,7 +91,7 @@ mkdir $SEND_TEST_DIR/test/foo
touch $SEND_TEST_DIR/test/foo/bar touch $SEND_TEST_DIR/test/foo/bar
touch $SEND_TEST_DIR/test/blah touch $SEND_TEST_DIR/test/blah
$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ $BTRFS_UTIL_PROG subvolume snapshot -r $TEST_DIR/$tmp_dir/send \
$TEST_DIR/$tmp_dir/snap2 >> $seqres.full 2>&1 || _fail "failed snap2" $TEST_DIR/$tmp_dir/snap2 >> $seqres.full 2>&1 || _fail "failed snap2"
$BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send2.dump \ $BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send2.dump \
tests/btrfs/022
+3 -3
View File
@@ -75,7 +75,7 @@ _basic_test()
_rescan_test() _rescan_test()
{ {
# first with a blank subvol # first with a blank subvol
run_check $BTRFS_UTIL_PROG subvol create $SCRATCH_MNT/a run_check $BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a
run_check $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT/a run_check $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT/a
subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
run_check $FSSTRESS_PROG -d $SCRATCH_MNT/a -w -p 1 -n 2000 \ run_check $FSSTRESS_PROG -d $SCRATCH_MNT/a -w -p 1 -n 2000 \
@@ -97,7 +97,7 @@ _rescan_test()
#basic exceed limit testing #basic exceed limit testing
_limit_test_exceed() _limit_test_exceed()
{ {
run_check $BTRFS_UTIL_PROG subvol create $SCRATCH_MNT/a run_check $BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a
run_check $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT run_check $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
run_check $BTRFS_UTIL_PROG qgroup limit 5M 0/$subvolid $SCRATCH_MNT run_check $BTRFS_UTIL_PROG qgroup limit 5M 0/$subvolid $SCRATCH_MNT
@@ -109,7 +109,7 @@ _limit_test_exceed()
#basic noexceed limit testing #basic noexceed limit testing
_limit_test_noexceed() _limit_test_noexceed()
{ {
run_check $BTRFS_UTIL_PROG subvol create $SCRATCH_MNT/a run_check $BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a
run_check $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT run_check $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
run_check $BTRFS_UTIL_PROG qgroup limit 5M 0/$subvolid $SCRATCH_MNT run_check $BTRFS_UTIL_PROG qgroup limit 5M 0/$subvolid $SCRATCH_MNT
tests/btrfs/024
+1 -1
View File
@@ -1,5 +1,5 @@
#! /bin/bash #! /bin/bash
# FS QA Test No. btrfs/008 # FS QA Test No. btrfs/024
# #
# btrfs wrong compression type regression test. This test is used to check # btrfs wrong compression type regression test. This test is used to check
# the oops will happen when the users write some data into the files whose # the oops will happen when the users write some data into the files whose
tests/btrfs/025
+2 -2
View File
@@ -63,13 +63,13 @@ $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
$XFS_IO_PROG -f -c "pwrite 1482752 2978" $SCRATCH_MNT/foo | _filter_xfs_io $XFS_IO_PROG -f -c "pwrite 1482752 2978" $SCRATCH_MNT/foo | _filter_xfs_io
$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
$BTRFS_UTIL_PROG subvol snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 | \ $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 | \
_filter_scratch _filter_scratch
$XFS_IO_PROG -f -c "truncate 883305" $SCRATCH_MNT/foo | _filter_xfs_io $XFS_IO_PROG -f -c "truncate 883305" $SCRATCH_MNT/foo | _filter_xfs_io
$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
$BTRFS_UTIL_PROG subvol snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 | \ $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 | \
_filter_scratch _filter_scratch
$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap 2>&1 | _filter_scratch $BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap 2>&1 | _filter_scratch