public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
* [xfstests-bld PATCH] test-appliance: detect 'mkfs.f2fs -f' support by grepping help output
@ 2018-04-16 22:06 Eric Biggers
  2018-04-17 16:08 ` Theodore Y. Ts'o
  0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2018-04-16 22:06 UTC (permalink / raw)
  To: Theodore Y . Ts'o; +Cc: fstests, Eric Biggers

From: Eric Biggers <ebiggers@google.com>

Grep the help output rather than the binary itself.  This matches the
detection method that was implemented in xfstests common/config.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 kvm-xfstests/test-appliance/files/root/fs/f2fs/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
index 0efcb76..b0c2196 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
+++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
@@ -20,7 +20,7 @@ function format_filesystem()
     local dev="$1"
     local opts="$2"
 
-    if grep -q 'force overwrite' /sbin/mkfs.f2fs; then
+    if /sbin/mkfs.f2fs --help |& grep -q "[[:space:]]-f[[:space:]|]"; then
 	# f2fs-tools v1.9+
 	opts+=" -f"
     fi
-- 
2.17.0.484.g0c8726318c-goog


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [xfstests-bld PATCH] test-appliance: detect 'mkfs.f2fs -f' support by grepping help output
  2018-04-16 22:06 [xfstests-bld PATCH] test-appliance: detect 'mkfs.f2fs -f' support by grepping help output Eric Biggers
@ 2018-04-17 16:08 ` Theodore Y. Ts'o
  0 siblings, 0 replies; 2+ messages in thread
From: Theodore Y. Ts'o @ 2018-04-17 16:08 UTC (permalink / raw)
  To: Eric Biggers; +Cc: fstests, Eric Biggers

On Mon, Apr 16, 2018 at 03:06:21PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> Grep the help output rather than the binary itself.  This matches the
> detection method that was implemented in xfstests common/config.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Applied, thanks.

					- Ted

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-04-17 16:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-16 22:06 [xfstests-bld PATCH] test-appliance: detect 'mkfs.f2fs -f' support by grepping help output Eric Biggers
2018-04-17 16:08 ` Theodore Y. Ts'o

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox