From patchwork Wed Jan 11 10:48:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 9509823 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 D2CEA60710 for ; Wed, 11 Jan 2017 10:48:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D63BB284DA for ; Wed, 11 Jan 2017 10:48:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C85BD284EC; Wed, 11 Jan 2017 10:48:40 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 482AB284DA for ; Wed, 11 Jan 2017 10:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760477AbdAKKsj (ORCPT ); Wed, 11 Jan 2017 05:48:39 -0500 Received: from mx2.suse.de ([195.135.220.15]:57131 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760447AbdAKKsj (ORCPT ); Wed, 11 Jan 2017 05:48:39 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B4B5EAAC4 for ; Wed, 11 Jan 2017 10:48:37 +0000 (UTC) From: David Disseldorp To: fstests@vger.kernel.org Cc: David Disseldorp Subject: [PATCH] common: use xfs_io to obtain the xfsprogs version Date: Wed, 11 Jan 2017 11:48:20 +0100 Message-Id: <20170111104820.7367-1-ddiss@suse.de> X-Mailer: git-send-email 2.10.2 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xfs_db is currently used for this, but is otherwise only used for XFS specific tests. This change allows for the generic tests to be run on a system without the xfs_db binary. Signed-off-by: David Disseldorp Reviewed-by: Eric Sandeen --- common/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/config b/common/config index 6cce7ce..1604aa9 100644 --- a/common/config +++ b/common/config @@ -226,11 +226,11 @@ export UDEV_SETTLE_PROG # Generate a comparable xfsprogs version number in the form of # major * 10000 + minor * 100 + release # -# $ xfs_db -V -# xfs_db version 2.9.7 +# $ xfs_io -V +# xfs_io version 2.9.7 # # so, 2.9.7 = 20907 -_version=`$XFS_DB_PROG -V | $AWK_PROG ' +_version=`$XFS_IO_PROG -V | $AWK_PROG ' /version/ { if (split($3,ver,".") == 3) print (ver[1] * 10000) + (ver[2] * 100) + ver[3];