From patchwork Wed Oct 8 10:35:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 5051031 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CEA7A9F30B for ; Wed, 8 Oct 2014 02:36:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13E232020E for ; Wed, 8 Oct 2014 02:36:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26333201F2 for ; Wed, 8 Oct 2014 02:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752961AbaJHCgN (ORCPT ); Tue, 7 Oct 2014 22:36:13 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:46665 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751029AbaJHCgM (ORCPT ); Tue, 7 Oct 2014 22:36:12 -0400 Received: by mail-pa0-f50.google.com with SMTP id kx10so8326872pab.9 for ; Tue, 07 Oct 2014 19:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7cPgdCP/tHtVjChImgjzNzNkxGaEZhJGlY/WzMVkT9g=; b=HVbQ1Qf4TAYBcter3UFHgZoFekg8JQvdPefs7Dg14vvyOUQRzcJnTOYv4NwIOcZDxR s/lnznwpwSK8ejl9Upy4nohG8WTkv7mSnfC+992EA1xAVH86V7eTs6OE9366Sc5oLkom /mr+dPGo9cRf26OeNbL0jRDSfhChTLbOxxZcjhI4n/JxUBmBoKJPt03pcrACf9D0zt5y cylCVQcJy0CZ21+mRboWxor7FORUUYWXqREQUGZdjnOb5zYnNnJyeGAMFyxter0MH4oq 2/Uz8P9LP6XVIN4Dv1+XSemRo59rgfgxcheGKltehyhWm8rbsMjAZHVPqZVHgHT+K96u C9aA== X-Received: by 10.70.65.7 with SMTP id t7mr7659773pds.133.1412735771725; Tue, 07 Oct 2014 19:36:11 -0700 (PDT) Received: from vm01.localdomain ([221.181.146.136]) by mx.google.com with ESMTPSA id iq3sm17070313pbb.71.2014.10.07.19.36.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Oct 2014 19:36:11 -0700 (PDT) From: Wang Shilong To: fstests@vger.kernel.org Cc: david@fromorbit.com, linux-btrfs@vger.kernel.org Subject: [PATCH 2/2] xfstests,btrfs/004: use FILEFRAG_PROG macro Date: Wed, 8 Oct 2014 06:35:22 -0400 Message-Id: <1412764522-15754-2-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1412764522-15754-1-git-send-email-wangshilong1991@gmail.com> References: <1412764522-15754-1-git-send-email-wangshilong1991@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Wang Shilong --- i didn't find a way to remove filefrag here, but let us use macro firstly... --- tests/btrfs/004 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/btrfs/004 b/tests/btrfs/004 index 1d5b816..1f59963 100755 --- a/tests/btrfs/004 +++ b/tests/btrfs/004 @@ -53,7 +53,6 @@ _supported_os Linux _require_scratch _require_no_large_scratch_dev _require_btrfs inspect-internal -_require_command "/usr/sbin/filefrag" rm -f $seqres.full @@ -82,7 +81,7 @@ _filter_extents() _check_file_extents() { - cmd="filefrag -v $1" + cmd="$FILEFRAG_PROG -v $1" echo "# $cmd" >> $seqres.full out=`$cmd | _filter_extents` if [ -z "$out" ]; then