From: Eric Sandeen <sandeen@sandeen.net>
Date: Thu, 12 Feb 2015 03:11:04 +0000 (+1100)
Subject: shared/032: handle mkfs.* in either /sbin or /usr/sbin
X-Git-Tag: v2022.05.01~2964
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4046dd9fc6b0d1e3e1e34b80b72dc00117c1a44a;p=xfstests-dev.git

shared/032: handle mkfs.* in either /sbin or /usr/sbin

mkfs executables may live in either /sbin or /usr/sbin, and
the current regexp in this test only catches the former,
and so the test won't run properly with the latter.

Fix this by filtering out whatever was found as
${MKFS_PROG}, rather than a hard-coded /sbin/mkfs path.

Because the list was generated by using a wildcard
with ${MKFS_PROG}.* this will always be the correct filter.

Reported-by: Boaz Harrosh <boaz@plexistor.com>
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/shared/032 b/tests/shared/032
index a4100030..3b063826 100755
--- a/tests/shared/032
+++ b/tests/shared/032
@@ -50,7 +50,7 @@ if [ "$FSTYP" == "btrfs" ]; then
 fi
 
 echo "Silence is golden."
-for fs in `echo ${MKFS_PROG}.* | sed -e 's/.sbin.mkfs.//g'`
+for fs in `echo ${MKFS_PROG}.* | sed -e "s:${MKFS_PROG}.::g"`
 do
 	preop=""	# for special input needs
 	preargs=""	# for any special pre-device options