xfs/049, 073: use MKFS_XFS_PROG where appropriate
authorEric Sandeen <sandeen@redhat.com>
Mon, 20 Jan 2014 02:28:38 +0000 (13:28 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 20 Jan 2014 02:28:38 +0000 (13:28 +1100)
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>
tests/xfs/049
tests/xfs/073

index 850d371e50b64aba95789bd8cbcec4132e42f38c..dc76baa3caa556dab8ce217c5dcae6f300ecc284 100755 (executable)
@@ -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"
 
index ad380593c3b2a2004668d46a775c75bd7e6a3ee6..4280fa9e9554f67fd7054a257b28b80d3fbbbd07 100755 (executable)
@@ -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