xfstests: setup and run non-generic mkfs for btrfs

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/common b/common
index 817c0039f830c1c778958b4afac12601d4be9cb3..07232245b1fe6eb5a55d84c11796debc746d0d37 100644 (file)
--- a/common
+++ b/common
@@ -306,6 +306,9 @@ case "$FSTYP" in
     udf)
         [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
         ;;
+    btrfs)
+        [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
+        ;;
     nfs)
         ;;
 esac

diff --git a/common.config b/common.config
index 3642139107999bf80208ff8d307417b240495678..e94624eef3daadaf3d79fb9c29847eccc3da7bb8 100644 (file)
--- a/common.config
+++ b/common.config
@@ -184,6 +184,7 @@ case "$HOSTOS" in
     Linux)
         export MKFS_XFS_PROG="`set_prog_path mkfs.xfs`"
         export MKFS_UDF_PROG="`set_prog_path mkudffs`"
+        export MKFS_BTRFS_PROG="`set_prog_path mkfs.btrfs`"
         export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
         export MKFS_NFS_PROG="false"
         ;;

diff --git a/common.rc b/common.rc
index 2cbcb73a3dda923e71832ef79291410a29e72e79..35f782b3f46b898818ea3cdf5d53c32ce2543ed4 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -310,6 +310,9 @@ _scratch_mkfs()
     udf)
         $MKFS_UDF_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
        ;;
+    btrfs)
+        $MKFS_BTRFS_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
+       ;;
     *)
        /sbin/mkfs -t $FSTYP -- $MKFS_OPTIONS $* $SCRATCH_DEV
        ;;
@@ -333,7 +336,7 @@ _scratch_mkfs_sized()
        /sbin/mkfs.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
        ;;
     btrfs)
-       /sbin/mkfs.$FSTYP $MKFS_OPTIONS $SCRATCH_DEV -b $fssize
+       $MKFS_BTRFS_PROG $MKFS_OPTIONS -b $fssize $SCRATCH_DEV
        ;;
     *)
        _notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"