From patchwork Mon Apr 16 22:06:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10343975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D6D6660216 for ; Mon, 16 Apr 2018 22:06:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C28C1200E7 for ; Mon, 16 Apr 2018 22:06:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B32872892A; Mon, 16 Apr 2018 22:06:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52F35200E7 for ; Mon, 16 Apr 2018 22:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751942AbeDPWGp (ORCPT ); Mon, 16 Apr 2018 18:06:45 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:42154 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbeDPWGp (ORCPT ); Mon, 16 Apr 2018 18:06:45 -0400 Received: by mail-pf0-f193.google.com with SMTP id o16so11168297pfk.9 for ; Mon, 16 Apr 2018 15:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6nex7/TaDht3sCw36LBYjwXhluG905Yu22l41BFmJlA=; b=WSOP7CJP+KYjyfSVevTe7/rZ4T005IvZCYREBu9uqByOEqnDZjw7oKYGP6iZmFEygw S1mE3AB7KRnaaNQSUGL2wPAnZw8G7Hnp145+v90+Q2Idus9iyQAhS9iQb23E0SmHlpd4 m7sNAACi+KhtSFyFHxwHHBtpo4IKTvZsInpTmVkqJzOfCByq+mg/iik4HKaePgjqLOcg ICgztVVK3PhBz4+Di8iqddU1QWiy9JHZXKh5EdxxVtZYDDEjjuYLjxkJeUjvm/GnjMwl h9dT/HcT+HBEfZ93A64TDNqiYHHAue8+pX+17kDDP0AprL0DZa7gKoCFPieKHkeX/aeP VEwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6nex7/TaDht3sCw36LBYjwXhluG905Yu22l41BFmJlA=; b=U2cM20fWLeq11UmIDoGDGsIByNzMWfEYXwi+pkzM63ew8rYgIPeFJfwcP9PaN5g9yl ZLfc2pOCxrAsCViYpkoc73KxSUyDJbfXUWo790WqJLzANe+YDr3qC8xVbl8DlWaKz/SV hu/UEHIWwgqYz/0+1ITBtVVAF1Do1wckhn6DvycV5JR1K733czwfKH3pUo3xbSrzY8Mc YR9kflEsRzH0e2d7KWqilxncO86U1geo+4qqCAoSthF7r2ad3fdul3vMq0vevFViQwhh PicjDenENLe0uozNGweMmlfrmzSl3e0CE9vnv5UwGc1sLLc7uiBfTGb9Oz40c9oQCekS uECw== X-Gm-Message-State: ALQs6tC4gCoVfC7liDJ92YEAHJ6EOxXmMK77BSOh5PaJ2XbUVMEA/yJD cwiKupWHSJyq58NpPghxB7k= X-Google-Smtp-Source: AIpwx4/NDIq4a3vtmCsoz5pyHXAA7FWGQw+D7EKW8egSlXYeELKRhPUyPsFsKk/Zu9nSv5xkeCyPxA== X-Received: by 10.99.99.198 with SMTP id x189mr11756591pgb.371.1523916404686; Mon, 16 Apr 2018 15:06:44 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([2620:15c:17:3:dc28:5c82:b905:e8a8]) by smtp.gmail.com with ESMTPSA id d64sm24582047pfa.80.2018.04.16.15.06.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 15:06:43 -0700 (PDT) From: Eric Biggers To: "Theodore Y . Ts'o" Cc: fstests@vger.kernel.org, Eric Biggers Subject: [xfstests-bld PATCH] test-appliance: detect 'mkfs.f2fs -f' support by grepping help output Date: Mon, 16 Apr 2018 15:06:21 -0700 Message-Id: <20180416220621.196700-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers 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 --- 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