xfstests: clean command names in btrfs tests

- 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>

diff --git a/tests/btrfs/003 b/tests/btrfs/003
index 29f947b631cd66a9aa92b75e7d5b7e7fab3d43be..d559f8ed1df9145486458bfb67c07f79cc4ff8c6 100755 (executable)
--- a/tests/btrfs/003
+++ b/tests/btrfs/003
@@ -148,7 +148,7 @@ _test_replace()
        _devmgt_remove ${DEVHTL} $ds
        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"
 
        # add a new disk to btrfs

diff --git a/tests/btrfs/004 b/tests/btrfs/004
index 6e58b03ccf4708408f4f04b0c091b01d24a4e35b..14da9f1a33f6d948d6bef4c8e3a133bcac855de2 100755 (executable)
--- a/tests/btrfs/004
+++ b/tests/btrfs/004
@@ -182,7 +182,7 @@ workout()
        run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p $procs -n 2000 \
                $FSSTRESS_AVOID
 
-       run_check $BTRFS_UTIL_PROG subvol snap $SCRATCH_MNT \
+       run_check $BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT \
                $SCRATCH_MNT/$snap_name
 
        run_check umount $SCRATCH_DEV >/dev/null 2>&1

diff --git a/tests/btrfs/007 b/tests/btrfs/007
index 1617977c2be8eff155a236d631a50ed69815449c..5df9ccba088875925d4c57e32b80d619519696f1 100755 (executable)
--- a/tests/btrfs/007
+++ b/tests/btrfs/007
@@ -72,9 +72,9 @@ workout()
        run_check _scratch_mount "-o noatime"
 
        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" \
                >> $seqres.full

diff --git a/tests/btrfs/008 b/tests/btrfs/008
index fa61cb1bfe79c56817996dae02cfe11b47c7a144..9fa36a613667f00d585d5654ecb542f40ec188de 100755 (executable)
--- a/tests/btrfs/008
+++ b/tests/btrfs/008
@@ -34,9 +34,9 @@ status=1      # failure is the default!
 
 _cleanup()
 {
-       $BTRFS_UTIL_PROG subvol del $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 subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1
+       $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/send/snapshots/backup2 > /dev/null 2>&1
+       $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/send/snapshots/backup3 > /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 -f $tmp.*
 }
@@ -62,7 +62,7 @@ export SELINUX_MOUNT_OPTIONS=""
 _scratch_mount
 
 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"
 work_dir="$TEST_DIR/$tmp_dir/send"
 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
 
 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"
-$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"
 $BTRFS_UTIL_PROG send $work_dir/snapshots/backup3/ -f $TEST_DIR/$tmp_dir/blah \
        >> $seqres.full 2>&1 || _fail "send failed"

diff --git a/tests/btrfs/009 b/tests/btrfs/009
index 08aa5081b46fb4a53296e3c4c6781aeb44cca8af..2ffb81730d2445c42b80ebdefee1e2dd38a7c45a 100755 (executable)
--- a/tests/btrfs/009
+++ b/tests/btrfs/009
@@ -52,12 +52,12 @@ rm -f $seqres.full
 _scratch_mkfs > /dev/null 2>&1
 _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"
 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"
-$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_mount || _fail "mount should have succeeded"
 

diff --git a/tests/btrfs/013 b/tests/btrfs/013
index 5bbd7a3118e68a470316e049f05917a112867cc3..7620fcc450f37c7748e2fed09e2cd6c7e02a9ec8 100644 (file)
--- a/tests/btrfs/013
+++ b/tests/btrfs/013
@@ -72,7 +72,7 @@ _check_csum_error()
 }
 $XFS_IO_PROG -f -c "falloc 0 1M" -c "pwrite 16k 8k" -c "fsync" \
        $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"
 _scratch_unmount
 _scratch_mount

diff --git a/tests/btrfs/014 b/tests/btrfs/014
index aa3edbb0ad14225b12f4a850da36cdd142164423..142423f7910daa47a68a2582d274b1f62cda1bbf 100755 (executable)
--- a/tests/btrfs/014
+++ b/tests/btrfs/014
@@ -33,8 +33,8 @@ _create_snapshot()
 {
        for i in $(seq 20)
        do
-               btrfs sub snapshot $SCRATCH_MNT $SCRATCH_MNT/snapshot0 >/dev/null
-               btrfs sub delete $SCRATCH_MNT/snapshot0 >/dev/null
+               $BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snapshot0 >/dev/null
+               $BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snapshot0 >/dev/null
        done
 }
 
@@ -42,7 +42,7 @@ _balance()
 {
        for i in $(seq 20)
        do
-               btrfs balance start $SCRATCH_MNT >/dev/null
+               $BTRFS_UTIL_PROG balance start $SCRATCH_MNT >/dev/null
        done
 }
 

diff --git a/tests/btrfs/015 b/tests/btrfs/015
index b7b50214488970c4a142c8c0f1a0a8b1c82323be..0b5fdfd5b951202a43af13cf0c4848f6be8af383 100644 (file)
--- a/tests/btrfs/015
+++ b/tests/btrfs/015
@@ -54,7 +54,7 @@ _scratch_mkfs > /dev/null 2>&1
 _scratch_mount -o ro
 _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"
 
 echo "Silence is golden"

diff --git a/tests/btrfs/016 b/tests/btrfs/016
index d711ecb63c14a682ee4fa63600d7cecb15716a3f..6faead1070d7fbe1abe0c3e30fadc6c5f6be1d53 100644 (file)
--- a/tests/btrfs/016
+++ b/tests/btrfs/016
@@ -34,9 +34,9 @@ status=1      # failure is the default!
 
 _cleanup()
 {
-       $BTRFS_UTIL_PROG subvol del $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 subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1
+       $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap > /dev/null 2>&1
+       $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap1 > /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 -f $tmp.*
 }
@@ -65,15 +65,15 @@ export SELINUX_MOUNT_OPTIONS=""
 _scratch_mount
 
 mkdir $TEST_DIR/$tmp_dir
-$BTRFS_UTIL_PROG subvol create $TEST_DIR/$tmp_dir/send \
-       > $seqres.full 2>&1 || _fail "failed subvol create"
+$BTRFS_UTIL_PROG subvolume create $TEST_DIR/$tmp_dir/send \
+       > $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 \
        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"
 $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"
 
 $FSSUM_PROG -A -f -w $tmp/fssum.snap $TEST_DIR/$tmp_dir/snap >> $seqres.full \

diff --git a/tests/btrfs/017 b/tests/btrfs/017
index d45f32a863d1b185007903be665874fbb0f6450b..1f31e8a7bb331d8fb4ba73004591a427ec4f837f 100644 (file)
--- a/tests/btrfs/017
+++ b/tests/btrfs/017
@@ -54,7 +54,7 @@ _scratch_mkfs > /dev/null 2>&1
 _scratch_mount -o ro
 _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"
 
 echo "Silence is golden"

diff --git a/tests/btrfs/019 b/tests/btrfs/019
index c20ed9b5c153df6eb50b81a1280cde252e6f2559..45bba5ef98a3bbfec4214e77d57b8127d673f341 100755 (executable)
--- a/tests/btrfs/019
+++ b/tests/btrfs/019
@@ -34,9 +34,9 @@ status=1      # failure is the default!
 
 _cleanup()
 {
-       $BTRFS_UTIL_PROG subvol del $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 subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1
+       $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap1 > /dev/null 2>&1
+       $BTRFS_UTIL_PROG subvolume delete $TEST_DIR/$tmp_dir/snap2 > /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 -f $tmp.*
 }
@@ -62,8 +62,8 @@ export SELINUX_MOUNT_OPTIONS=""
 _scratch_mount
 
 mkdir $TEST_DIR/$tmp_dir
-$BTRFS_UTIL_PROG subvol create $TEST_DIR/$tmp_dir/send \
-       > $seqres.full 2>&1 || _fail "failed subvol create"
+$BTRFS_UTIL_PROG subvolume create $TEST_DIR/$tmp_dir/send \
+       > $seqres.full 2>&1 || _fail "failed subvolume create"
 
 SEND_TEST_DIR=$TEST_DIR/$tmp_dir/send
 
@@ -73,7 +73,7 @@ touch $SEND_TEST_DIR/test/blah
 mkdir $SEND_TEST_DIR/test/foo
 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"
 
 $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/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"
 
 $BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send2.dump \

diff --git a/tests/btrfs/022 b/tests/btrfs/022
index 41d8588d10230aaafda5a1a39f39103337746575..ab256a39d89066c453fb6e933be7ccdff15c5f92 100755 (executable)
--- a/tests/btrfs/022
+++ b/tests/btrfs/022
@@ -75,7 +75,7 @@ _basic_test()
 _rescan_test()
 {
        # 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
        subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
        run_check $FSSTRESS_PROG -d $SCRATCH_MNT/a -w -p 1 -n 2000 \
@@ -97,7 +97,7 @@ _rescan_test()
 #basic exceed limit testing
 _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
        subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
        run_check $BTRFS_UTIL_PROG qgroup limit 5M 0/$subvolid $SCRATCH_MNT
@@ -109,7 +109,7 @@ _limit_test_exceed()
 #basic noexceed limit testing
 _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
        subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
        run_check $BTRFS_UTIL_PROG qgroup limit 5M 0/$subvolid $SCRATCH_MNT

diff --git a/tests/btrfs/024 b/tests/btrfs/024
index 1b619918a9297f7786418895d22289d61b141773..cb8a6e452376f9882559f7845ff949fd5c284de2 100755 (executable)
--- a/tests/btrfs/024
+++ b/tests/btrfs/024
@@ -1,5 +1,5 @@
 #! /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
 # the oops will happen when the users write some data into the files whose

diff --git a/tests/btrfs/025 b/tests/btrfs/025
index 5f13832be89c01dc38aa743f09c80b8c4c27d84e..482467ffc2d6395d102b01d901629e947ec08166 100755 (executable)
--- a/tests/btrfs/025
+++ b/tests/btrfs/025
@@ -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
 $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
 
 $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 subvol snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 | \
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 | \
     _filter_scratch
 
 $BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap 2>&1 | _filter_scratch