From nobody Sat May 4 04:11:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574856439; cv=none; d=zohomail.com; s=zohoarc; b=hhTSu5lTTl7B9VUi9xFfyLd5X6gumF5/gqCsULeOFD7zaU/jyszdziw860e0EvLP1VunATzWsq5Ad6GQN/h0QdsumG8T5zStrovK+0wm1JYVBdPAUq0ozpFu9Il8xAFdsFxqw1aGg+0D+3wCti4DAYyOqjf0oe7giPAX+1UxhzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574856439; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=AVHED5i48SVpCTqJ7GfKU6p0cdBwsBBw/lFZ1WCgBSI=; b=LKIGwEPqnBQRbTWxt6WrTN1w8rgTMGyk35/zkcFGpxDGZ5Rm3+o8vw/MIosHXIcme2quyRC0A/y84yLhD06e9a6rlm5yOxTIPte6jL6BJozpKBzqecV37tsAHP/E0lo/jxceGvoeMmNajfIpWh3HmyjD1zl/b08VtQPVrO1N4m8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574856439725874.5246859032628; Wed, 27 Nov 2019 04:07:19 -0800 (PST) Received: from localhost ([::1]:37516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZw6H-0001h8-V1 for importer@patchew.org; Wed, 27 Nov 2019 07:07:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52211) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZw5P-0001Hl-3G for qemu-devel@nongnu.org; Wed, 27 Nov 2019 07:06:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZw5N-0005zI-8l for qemu-devel@nongnu.org; Wed, 27 Nov 2019 07:06:22 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:44693 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZw5N-0005z5-5O for qemu-devel@nongnu.org; Wed, 27 Nov 2019 07:06:21 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-174-gOwXNsziO4KsHzuyJbdRSg-1; Wed, 27 Nov 2019 07:06:17 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6EFC3184CAA6; Wed, 27 Nov 2019 12:06:16 +0000 (UTC) Received: from localhost (ovpn-205-186.brq.redhat.com [10.40.205.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05AA33BE; Wed, 27 Nov 2019 12:06:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574856380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AVHED5i48SVpCTqJ7GfKU6p0cdBwsBBw/lFZ1WCgBSI=; b=JifsjBESqeoPN1fgiIAROnnOfGlaAAT+eTQFuWELcW6DiaUo556GWVqB/uNAjjNQjFkd7Y RdtMHphFDCCZ51h4MpnL0devodPhyoXOUZv1WfAcGbcL5fKdi8wvnjRuJquxSJ0Xl023am giZqSlSUdKENgD7qAmwu+OoWwVPXSqk= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH] iotests/273: Filter format-specific information Date: Wed, 27 Nov 2019 13:06:14 +0100 Message-Id: <20191127120614.513834-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: gOwXNsziO4KsHzuyJbdRSg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Doing this allows running this test with e.g. -o compat=3D0.10 or -o compat=3Drefcount_bits=3D1. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/273 | 3 ++- tests/qemu-iotests/273.out | 27 --------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273 index 98a672516d..d598c47d9b 100755 --- a/tests/qemu-iotests/273 +++ b/tests/qemu-iotests/273 @@ -48,7 +48,8 @@ do_run_qemu() run_qemu() { do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp | - _filter_generated_node_ids | _filter_imgfmt | _filter_actual_image= _size + _filter_generated_node_ids | _filter_imgfmt | + _filter_actual_image_size | _filter_img_info } =20 TEST_IMG=3D"$TEST_IMG.base" _make_test_img 64M diff --git a/tests/qemu-iotests/273.out b/tests/qemu-iotests/273.out index c410fee5c4..684b8d6f77 100644 --- a/tests/qemu-iotests/273.out +++ b/tests/qemu-iotests/273.out @@ -38,15 +38,6 @@ Testing: -blockdev file,node-name=3Dbase,filename=3DTEST= _DIR/t.IMGFMT.base -blockdev "cluster-size": 65536, "format": "IMGFMT", "actual-size": SIZE, - "format-specific": { - "type": "IMGFMT", - "data": { - "compat": "1.1", - "lazy-refcounts": false, - "refcount-bits": 16, - "corrupt": false - } - }, "full-backing-filename": "TEST_DIR/t.IMGFMT.base", "backing-filename": "TEST_DIR/t.IMGFMT.base", "dirty-flag": false @@ -57,15 +48,6 @@ Testing: -blockdev file,node-name=3Dbase,filename=3DTEST= _DIR/t.IMGFMT.base -blockdev "cluster-size": 65536, "format": "IMGFMT", "actual-size": SIZE, - "format-specific": { - "type": "IMGFMT", - "data": { - "compat": "1.1", - "lazy-refcounts": false, - "refcount-bits": 16, - "corrupt": false - } - }, "full-backing-filename": "TEST_DIR/t.IMGFMT.mid", "backing-filename": "TEST_DIR/t.IMGFMT.mid", "dirty-flag": false @@ -136,15 +118,6 @@ Testing: -blockdev file,node-name=3Dbase,filename=3DTE= ST_DIR/t.IMGFMT.base -blockdev "cluster-size": 65536, "format": "IMGFMT", "actual-size": SIZE, - "format-specific": { - "type": "IMGFMT", - "data": { - "compat": "1.1", - "lazy-refcounts": false, - "refcount-bits": 16, - "corrupt": false - } - }, "full-backing-filename": "TEST_DIR/t.IMGFMT.base", "backing-filename": "TEST_DIR/t.IMGFMT.base", "dirty-flag": false --=20 2.23.0