public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Omar Sandoval <osandov@fb.com>
To: Zhaolei <zhaolei@cn.fujitsu.com>
Cc: fstests@vger.kernel.org
Subject: Re: [PATCH] Fix test fail of btrfs/006 caused by updated _filter_uuid()
Date: Fri, 28 Aug 2015 14:12:45 -0700	[thread overview]
Message-ID: <20150828211245.GA30052@huxley.DHCP.TheFacebook.com> (raw)
In-Reply-To: <5e1bb4aacc6c5b57585e6f66a708b8c21ce032ab.1440037988.git.zhaolei@cn.fujitsu.com>

On Thu, Aug 20, 2015 at 10:33:49AM +0800, Zhaolei wrote:
> From: Zhao Lei <zhaolei@cn.fujitsu.com>
> 
> _filter_uuid() get updated and changed output from:
>  uuid: <UUID>
>  ->
>  uuid:  <UUID>
> 
> It is a typo introduced by xfs/077, this patch fixed this.
> 
> Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>

Thanks, Zhao Lei, I ran into this today.

Reviewed-by: Omar Sandoval <osandov@fb.com>

> ---
>  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 <EXACTUUID>/i"
>  	else
> -		sed -e "s/\(uuid[ :=]\+\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/ig"
> +		sed -e "s/\(uuid[ :=]\+\) [0-9a-f-][0-9a-f-]*/\1 <UUID>/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 =  <UUID>
> +new UUID = <UUID>
>  == Rewrite UUID
>  old UUID = <EXACTUUID>
>  Clearing log and setting UUID
> -- 
> 1.8.5.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Omar

      reply	other threads:[~2015-08-28 21:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-20  2:33 [PATCH] Fix test fail of btrfs/006 caused by updated _filter_uuid() Zhaolei
2015-08-28 21:12 ` Omar Sandoval [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150828211245.GA30052@huxley.DHCP.TheFacebook.com \
    --to=osandov@fb.com \
    --cc=fstests@vger.kernel.org \
    --cc=zhaolei@cn.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox