From patchwork Fri Apr 18 03:34:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 4012961 Return-Path: X-Original-To: patchwork-linux-btrfs@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 848689F2CC for ; Fri, 18 Apr 2014 02:38:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9806A202EC for ; Fri, 18 Apr 2014 02:38:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A97EA2025B for ; Fri, 18 Apr 2014 02:38:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751257AbaDRCij (ORCPT ); Thu, 17 Apr 2014 22:38:39 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:42112 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041AbaDRCih (ORCPT ); Thu, 17 Apr 2014 22:38:37 -0400 Received: by mail-wi0-f182.google.com with SMTP id d1so251551wiv.3 for ; Thu, 17 Apr 2014 19:38:36 -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; bh=CD+sbRaKlU60p2Nu2pz2gdbl1bEVkfQxoRe6hGwQn6g=; b=IANmlqymJ99G2cUxPADTBsTlxGnDd5sFQGIhRmizYvrDiTSXvvKsFMEzWTOanbmuqE DH4XoMgu4stUwer4opuvpqgtESYFeTu3J1T8B7A8vGFjAst0TPxTqsG2uR6hqrRKgTBV ulYjP5X6XL2hPQKeZOeRLqubi7VWUBmcJgSvw9kVOtYlzf+aO54t7RxgbEidARnf4qiu We6jl3vR4pDvoUIEAIfu5N0zg9AZoi9Hzyi1DZ9UbGl7GI1KTzOCeyMDjNoga5x36U+a NtX/y2tzLbfmA3KwNG5grRVdCYsmeWaNh3J1CBLe+0A6ovoZpGM5ViHzzlkiFREVzUd0 Ak9g== X-Received: by 10.180.93.226 with SMTP id cx2mr574897wib.16.1397788716752; Thu, 17 Apr 2014 19:38:36 -0700 (PDT) Received: from debian-vm3.lan (bl10-198-83.dsl.telepac.pt. [85.243.198.83]) by mx.google.com with ESMTPSA id ct2sm41522071wjb.33.2014.04.17.19.38.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Apr 2014 19:38:35 -0700 (PDT) From: Filipe David Borba Manana To: xfs@oss.sgi.com Cc: linux-btrfs@vger.kernel.org, jbacik@fb.com, Filipe David Borba Manana Subject: [PATCH] xfstests: btrfs/004, fix filefrag filter for files with 1 block only Date: Fri, 18 Apr 2014 04:34:23 +0100 Message-Id: <1397792063-3660-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 If the file consists of a single block, then filefrag mentions '1 block of ...', and the filter expected 'blocks of ...'. Example: $ echo qwerty > foobar $ filefrag -v foobar Filesystem type is: ef53 File size of foobar is 7 (1 block of 4096 bytes) ext: logical_offset: physical_offset: length: expected: flags: 0: 0.. 0: 0.. 0: 1: unknown,delalloc,eof foobar: 1 extent found Signed-off-by: Filipe David Borba Manana --- tests/btrfs/004 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/btrfs/004 b/tests/btrfs/004 index 211d8bc..670e1c2 100755 --- a/tests/btrfs/004 +++ b/tests/btrfs/004 @@ -58,7 +58,7 @@ _require_command "/usr/sbin/filefrag" rm -f $seqres.full FILEFRAG_FILTER=' - if (/blocks of (\d+) bytes/) { + if (/blocks? of (\d+) bytes/) { $blocksize = $1; next }