tests: use 'btrfs' rather than 'btrfsctl'

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 859fc2bca1b58538d4ece11743efce60fec3c6fb..b3aaff99ff1d39869cd7165f2d37297d570fec2e 100755 (executable)
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -89,11 +89,11 @@ ts_finalize_subtest
 if [ -x "/sbin/mkfs.btrfs" ]; then
        $TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
        ts_log "Create filesystem [btrfs]"
-       /sbin/mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
+       mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
        udevadm settle
 
        mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
-       /sbin/btrfsctl -S sub $MOUNTPOINT &> /dev/null
+       btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
        umount $MOUNTPOINT &> /dev/null
 
        udevadm settle

diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index 024bd92d4547851ac79ad4cc8d12dbf9512d4fdd..ed379d4a61211e1ec75ced3d7336709b274c4121 100755 (executable)
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -87,11 +87,11 @@ ts_finalize_subtest
 if [ -x "/sbin/mkfs.btrfs" ]; then
        $TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
        ts_log "Create filesystem [btrfs]"
-       /sbin/mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
+       mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
        udevadm settle
 
        mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
-       /sbin/btrfsctl -S sub $MOUNTPOINT &> /dev/null
+       btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
        umount $MOUNTPOINT &> /dev/null
 
        udevadm settle