From patchwork Mon Jan 25 18:41:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8114491 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7E134BEEE5 for ; Mon, 25 Jan 2016 18:44:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF2D920274 for ; Mon, 25 Jan 2016 18:44:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B38C20270 for ; Mon, 25 Jan 2016 18:44:46 +0000 (UTC) Received: from localhost ([::1]:40308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNm85-0005ai-LX for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Jan 2016 13:44:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNm54-00084K-M7 for qemu-devel@nongnu.org; Mon, 25 Jan 2016 13:41:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNm4z-0005MO-NV for qemu-devel@nongnu.org; Mon, 25 Jan 2016 13:41:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNm4x-0005Lu-DF; Mon, 25 Jan 2016 13:41:31 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 07FCEC09FA87; Mon, 25 Jan 2016 18:41:31 +0000 (UTC) Received: from localhost (ovpn-116-72.ams2.redhat.com [10.36.116.72]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0PIfSpE027516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 25 Jan 2016 13:41:30 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 25 Jan 2016 19:41:11 +0100 Message-Id: <1453747275-9468-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1453747275-9468-1-git-send-email-mreitz@redhat.com> References: <1453747275-9468-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Paolo Bonzini , Fam Zheng , qemu-devel@nongnu.org, Max Reitz Subject: [Qemu-devel] [PATCH 4/8] iotests: Move _filter_nbd into common.filter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 _filter_nbd can be useful for other NBD tests, too, therefore it should reside in common.filter. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/083 | 12 ------------ tests/qemu-iotests/common.filter | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index 36e6de8..aa99278 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -49,18 +49,6 @@ wait_for_tcp_port() { done } -_filter_nbd() -{ - # nbd.c error messages contain function names and line numbers that are - # prone to change. Message ordering depends on timing between send and - # receive callbacks sometimes, making them unreliable. - # - # Filter out the TCP port number since this changes between runs. - sed -e 's#^.*nbd/.*\.c:.*##g' \ - -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \ - -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' -} - check_disconnect() { event=$1 when=$2 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index cfdb633..33ed1e4 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -230,5 +230,17 @@ _filter_qemu_img_map() -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt } +_filter_nbd() +{ + # nbd.c error messages contain function names and line numbers that are + # prone to change. Message ordering depends on timing between send and + # receive callbacks sometimes, making them unreliable. + # + # Filter out the TCP port number since this changes between runs. + sed -e 's#^.*nbd/.*\.c:.*##g' \ + -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \ + -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' +} + # make sure this script returns success true