From patchwork Tue Feb 9 13:23:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Silbe X-Patchwork-Id: 8261861 Return-Path: X-Original-To: patchwork-qemu-devel@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 0DF3A9F8AA for ; Tue, 9 Feb 2016 13:23:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 750762026D for ; Tue, 9 Feb 2016 13:23:43 +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 C69BF20263 for ; Tue, 9 Feb 2016 13:23:42 +0000 (UTC) Received: from localhost ([::1]:55952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8Gc-0007Ts-3v for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 08:23:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8GP-0007SL-6u for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:23:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT8GK-00055E-If for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:23:29 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:43824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8GK-00054U-7u for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:23:24 -0500 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 9 Feb 2016 13:23:22 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 9 Feb 2016 13:23:19 -0000 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: silbe@linux.vnet.ibm.com X-IBM-RcptTo: qemu-block@nongnu.org;qemu-devel@nongnu.org Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 8EF3F2190023; Tue, 9 Feb 2016 13:23:05 +0000 (GMT) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u19DNJjB25231514; Tue, 9 Feb 2016 13:23:19 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u19DNJA9025265; Tue, 9 Feb 2016 06:23:19 -0700 Received: from s38lp35.boeblingen.de.ibm.com (dyn-9-152-222-58.boeblingen.de.ibm.com [9.152.222.58]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u19DNIAn025252; Tue, 9 Feb 2016 06:23:18 -0700 From: Sascha Silbe To: qemu-devel@nongnu.org, Kevin Wolf , qemu-block@nongnu.org Date: Tue, 9 Feb 2016 14:23:09 +0100 Message-Id: <1455024190-105823-2-git-send-email-silbe@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455024190-105823-1-git-send-email-silbe@linux.vnet.ibm.com> References: <1455024190-105823-1-git-send-email-silbe@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16020913-0013-0000-0000-000008906BFB X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.109 Cc: Tu Bo Subject: [Qemu-devel] [PATCH 1/2] qemu-iotests: add _filter_qmp_events() for filtering out QMP events 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 The order of some QMP events may depend on the architecture being tested. Add support for filtering out QMP events so we can use a single reference output for all architecture when the test doesn't care about the events. Signed-off-by: Sascha Silbe --- tests/qemu-iotests/common.filter | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 84b7434..b908aa2 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -178,6 +178,12 @@ _filter_qmp() -e ' QMP_VERSION' } +# remove QMP events from output +_filter_qmp_events() +{ + sed -e '/^{\(.*, \)"event": ".*}$/ d' +} + # replace driver-specific options in the "Formatting..." line _filter_img_create() {