From: Eric Sandeen <sandeen@redhat.com>
Date: Mon, 20 Jan 2014 02:28:38 +0000 (+1100)
Subject: xfs/049, 073: use MKFS_XFS_PROG where appropriate
X-Git-Tag: v2022.05.01~3292
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94d3f7781901d33e4e61c3a9107c666399281887;p=xfstests-dev.git

xfs/049, 073: use MKFS_XFS_PROG where appropriate

I got burned on a mishmash system with /usr/sbin/mkfs but
/sbin/mkfs.xfs - or was it the other way around...

Anyway, in these tests, there's no need for the concatenation
to create "mkfs.xfs" - just use MKFS_XFS_PROG.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/tests/xfs/049 b/tests/xfs/049
index 850d371e..dc76baa3 100755
--- a/tests/xfs/049
+++ b/tests/xfs/049
@@ -82,7 +82,7 @@ mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seqres.full 2>&1 \
     || _fail "!!! failed to mount"
 
 _log "Create xfs fs in file on scratch"
-${MKFS_PROG}.xfs -f -dfile,name=$SCRATCH_MNT/test.xfs,size=40m \
+${MKFS_XFS_PROG} -f -dfile,name=$SCRATCH_MNT/test.xfs,size=40m \
     >> $seqres.full 2>&1 \
     || _fail "!!! failed to mkfs xfs"
 
diff --git a/tests/xfs/073 b/tests/xfs/073
index ad380593..4280fa9e 100755
--- a/tests/xfs/073
+++ b/tests/xfs/073
@@ -153,7 +153,7 @@ _verify_copy $imgs.image $SCRATCH_DEV $SCRATCH_MNT
 
 echo 
 echo === copying scratch device to single target, large ro device
-${MKFS_PROG}.xfs -dfile,name=$imgs.source,size=100g | _filter_mkfs 2>/dev/null
+${MKFS_XFS_PROG} -dfile,name=$imgs.source,size=100g | _filter_mkfs 2>/dev/null
 rmdir $imgs.source_dir 2>/dev/null
 mkdir $imgs.source_dir