From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53748)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1ZwlNY-0003Ck-Ue
	for qemu-devel@nongnu.org; Thu, 12 Nov 2015 01:29:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1ZwlNY-0001IW-3F
	for qemu-devel@nongnu.org; Thu, 12 Nov 2015 01:29:04 -0500
Date: Thu, 12 Nov 2015 14:28:54 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20151112062854.GH4082@ad.usersys.redhat.com>
References: <1447108773-6836-1-git-send-email-mreitz@redhat.com>
	<1447108773-6836-9-git-send-email-mreitz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1447108773-6836-9-git-send-email-mreitz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v7 08/24] iotests: Make _filter_nbd support
 more URL types
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Max Reitz <mreitz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>, qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>

On Mon, 11/09 23:39, Max Reitz wrote:
> This function should support URLs of the "nbd://" format (without
> swallowing the export name), and for "nbd:///" URLs it should replace
> "?socket=$TEST_DIR" by "?socket=TEST_DIR" because putting the Unix
> socket files into the test directory makes sense.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/common.filter | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
> index 0fc443a..bd53cab 100644
> --- a/tests/qemu-iotests/common.filter
> +++ b/tests/qemu-iotests/common.filter
> @@ -238,7 +238,8 @@ _filter_nbd()
>      #
>      # Filter out the TCP port number since this changes between runs.
>      sed -e '/nbd\.c:/d' \
> -        -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
> +        -e 's#nbd:\(//\)\?127\.0\.0\.1:[0-9]*#nbd:\1127.0.0.1:PORT#g' \
> +        -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \
>          -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
>  }
>  
> -- 
> 2.6.2
> 
> 

Reviewed-by: Fam Zheng <famz@redhat.com>