From patchwork Tue Mar 24 21:38:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 6086201 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EEEB89F2A9 for ; Tue, 24 Mar 2015 21:38:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 244FD20270 for ; Tue, 24 Mar 2015 21:38:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 414C3201EC for ; Tue, 24 Mar 2015 21:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751906AbbCXViZ (ORCPT ); Tue, 24 Mar 2015 17:38:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33835 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbbCXViZ (ORCPT ); Tue, 24 Mar 2015 17:38:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2OLcNQv003837 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 24 Mar 2015 17:38:24 -0400 Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2OLcKoG017427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 24 Mar 2015 17:38:23 -0400 Message-ID: <5511D94C.9090109@redhat.com> Date: Tue, 24 Mar 2015 16:38:20 -0500 From: Eric Sandeen MIME-Version: 1.0 To: fstests@vger.kernel.org CC: linux-btrfs Subject: [PATCH] fstests: update _filter_btrfs_version X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The btrfs cmd now sometimes emits "btrfs-progs" not "Btrfs-progs" as it used to, so update the filter accordingly. (This fixes a failure on btrfs/006 w/ btrfs-progs v3.19) Signed-off-by: Eric Sandeen Reviewed-by: Eryu Guan --- -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/filter.btrfs b/common/filter.btrfs index c9b3f3a..ea047c5 100644 --- a/common/filter.btrfs +++ b/common/filter.btrfs @@ -5,7 +5,7 @@ # Some, but not all, commands emit "Btrfs " _filter_btrfs_version() { - sed -e "s/^Btrfs.*//g" + sed -e "s/^[Bb]trfs.*//g" } _filter_devid()