Skip to contentSkip to conversation

xfstests: handle new mkfs.btrfs -f option cleanly

PATCH In review Eric Sandeen 3 participants 5 messages Feb 26, 2013 – Mar 6, 2013 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests: handle new mkfs.btrfs -f option cleanly

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.

---

common.config +12 -1
index 57f505d..9f1d309 100644
@@ -101,6 +101,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 "$*"
@@ -185,7 +196,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"
Reviewed-by Reviewed-by on v1 1/1
#1 lore raw

Looks good.

This patch has been committed.

Thanks
--Rich

commit 24fef70ef3fa0be047264b7a40b0bcf86533ec22

Author: Eric Sandeen <[email protected]>
Date:   Tue Feb 26 20:42:38 2013 +0000

xfstests: handle new mkfs.btrfs -f option cleanly

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.

#2 lore raw

PATCH 1/1 xfstests: Fix hang when mkfs.btrfs isn't present

In reply to Eric Sandeen

My earlier patch (xfstests: handle new mkfs.btrfs -f option cleanly) had a flaw in that if set_prog_path mkfs.btrfs returns nothing, the grep will hang.

Test for that case to avoid it, and just return the empty string in that case.

---

common.config +1 -1
index c10163a..a0b017d 100644
@@ -108,7 +108,7 @@ set_prog_path()
 set_btrfs_mkfs_prog_path_with_opts()
 {
 	p=`set_prog_path mkfs.btrfs`
-	if grep -q 'force overwrite' $p; then
+	if [ "$p" != "" ] && grep -q 'force overwrite' $p; then
 		echo "$p -f"
 	else
 		echo $p

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#4 lore raw

Re: [PATCH] xfstests: Fix hang when mkfs.btrfs isn't present

In reply to Eric Sandeen

This patch has been committed.

Thanks
--Rich

commit 52f4953ac4a377f9f7fc870d2a81f30c3e5d3c7f

Author: Eric Sandeen <[email protected]>
Date:   Tue Mar 5 22:41:54 2013 +0000

xfstests: Fix hang when mkfs.btrfs isn't present

My earlier patch (xfstests: handle new mkfs.btrfs -f option cleanly) had a flaw in that if set_prog_path mkfs.btrfs returns nothing, the grep will hang.

Test for that case to avoid it, and just return the empty string in that case.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs