From patchwork Fri Nov 23 05:24:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 10695053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C173613BF for ; Fri, 23 Nov 2018 06:03:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0E682C551 for ; Fri, 23 Nov 2018 06:03:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A30A12C57A; Fri, 23 Nov 2018 06:03:50 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 2CB082C4E3 for ; Fri, 23 Nov 2018 06:03:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387503AbeKWQqd (ORCPT ); Fri, 23 Nov 2018 11:46:33 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:9384 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729305AbeKWQqd (ORCPT ); Fri, 23 Nov 2018 11:46:33 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="48587485" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 23 Nov 2018 14:03:45 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 99EA84B6ED69; Fri, 23 Nov 2018 14:03:42 +0800 (CST) Received: from RHEL7U5GA_Intel64.g08.fujitsu.local (10.167.220.156) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 23 Nov 2018 14:03:47 +0800 From: Xiao Yang To: CC: , Xiao Yang Subject: [PATCH v2] common/rc: Add _require_filefrag_options() to check options for filefrag Date: Fri, 23 Nov 2018 13:24:23 +0800 Message-ID: <1542950663-7784-1-git-send-email-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20181123051251.GJ3889@desktop> References: <20181123051251.GJ3889@desktop> MIME-Version: 1.0 X-Originating-IP: [10.167.220.156] X-yoursite-MailScanner-ID: 99EA84B6ED69.A97E3 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In generic/519, filefrag command use FIBMAP ioctl(-B option) to print output in extent format(-e option) on purpose and sync file(-s option), so add _require_filefrag_options() to check if the command supports all of these options. References: 1) filefrag supports -e option by commit 2508eaa since e2fsprogs v1.42.7. 2) filefrag supports -B option by commit 5d5e01d since e2fsprogs v1.41.9. 3) filefrag supports -s option by commit e62847c since e2fsprogs v1.41.6. Signed-off-by: Xiao Yang --- common/rc | 15 ++++++++++++++- tests/generic/519 | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/common/rc b/common/rc index ecb1738..e5da648 100644 --- a/common/rc +++ b/common/rc @@ -3843,10 +3843,23 @@ _require_scratch_btime() _scratch_unmount } -_require_fibmap() +_require_filefrag_options() { _require_command "$FILEFRAG_PROG" filefrag + local options=$1 + local file="$TEST_DIR/options_testfile" + + echo "XX" > $file + ${FILEFRAG_PROG} -$options $file 2>&1 | grep -q "invalid option" && \ + _notrun "filefrag doesn't support $options option" + rm -f $file +} + +_require_fibmap() +{ + _require_filefrag_options "B" + local file="$TEST_DIR/fibmap_testfile" echo "XX" > $file diff --git a/tests/generic/519 b/tests/generic/519 index 229c5b4..d1a3c17 100755 --- a/tests/generic/519 +++ b/tests/generic/519 @@ -33,8 +33,8 @@ rm -f $seqres.full _supported_fs generic _supported_os Linux _require_scratch -_require_command "$FILEFRAG_PROG" filefrag _require_fibmap +_require_filefrag_options "es" testfile="$SCRATCH_MNT/$seq-testfile"