From patchwork Thu Aug 20 02:33:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaolei X-Patchwork-Id: 7040401 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F36099F373 for ; Thu, 20 Aug 2015 02:35:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19E6A207C4 for ; Thu, 20 Aug 2015 02:35:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 427EE207C0 for ; Thu, 20 Aug 2015 02:35:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751239AbbHTCf3 (ORCPT ); Wed, 19 Aug 2015 22:35:29 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:54515 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751015AbbHTCf3 (ORCPT ); Wed, 19 Aug 2015 22:35:29 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="99828647" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 20 Aug 2015 10:38:41 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t7K2ZMMR022919 for ; Thu, 20 Aug 2015 10:35:22 +0800 Received: from localhost.localdomain (10.167.226.114) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Thu, 20 Aug 2015 10:35:25 +0800 From: Zhaolei To: CC: Zhao Lei Subject: [PATCH] Fix test fail of btrfs/006 caused by updated _filter_uuid() Date: Thu, 20 Aug 2015 10:33:49 +0800 Message-ID: <5e1bb4aacc6c5b57585e6f66a708b8c21ce032ab.1440037988.git.zhaolei@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.1 MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 From: Zhao Lei _filter_uuid() get updated and changed output from: uuid: -> uuid: It is a typo introduced by xfs/077, this patch fixed this. Signed-off-by: Zhao Lei Reviewed-by: Omar Sandoval --- common/filter | 2 +- tests/xfs/077.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/filter b/common/filter index 8db1b3e..af456c9 100644 --- a/common/filter +++ b/common/filter @@ -277,7 +277,7 @@ _filter_uuid() UUID=$1 sed -e "s/\(uuid[ :=]\+\) $UUID/\1 /i" else - sed -e "s/\(uuid[ :=]\+\) *[0-9a-f-][0-9a-f-]*/\1 /ig" + sed -e "s/\(uuid[ :=]\+\) [0-9a-f-][0-9a-f-]*/\1 /ig" fi } diff --git a/tests/xfs/077.out b/tests/xfs/077.out index fdc7d72..4e18087 100644 --- a/tests/xfs/077.out +++ b/tests/xfs/077.out @@ -2,7 +2,7 @@ QA output created by 077 == Generate new UUID Clearing log and setting UUID writing all SBs -new UUID = +new UUID = == Rewrite UUID old UUID = Clearing log and setting UUID