apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: handle new mkfs.btrfs -f option cleanly

Browse Source 
I added an "-f" option to mkfs.btrfs to force overwrite
of an existing filesystem.  Now on an xfstests run, new
mkfs.btrfs requires it, and old mkfs.btrfs cannot accept
it.

So, add a helper which works out whether -f is needed,
and add it to the MKFS_BTRFS_PROG env. var as necessary,
so that it is an always-included option during the tests.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com> 
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Eric Sandeen
2013-02-26 20:42:38 +00:00
committed by Rich Johnston
parent 5825ecd3b9
commit 24fef70ef3
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.config
+12 -1
View File
@@ -104,6 +104,17 @@ set_prog_path()
return 1
}
# Handle mkfs.btrfs which does (or does not) require -f to overwrite
set_btrfs_mkfs_prog_path_with_opts()
{
p=`set_prog_path mkfs.btrfs`
if grep -q 'force overwrite' $p; then
echo "$p -f"
else
echo $p
fi
}
_fatal()
{
echo "$*"
@@ -192,7 +203,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 MKFS_BTRFS_PROG="`set_btrfs_mkfs_prog_path_with_opts`"
export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
export MKFS_NFS_PROG="false"