From nobody Wed Nov 12 10:09:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1569578049; cv=none; d=zoho.com; s=zohoarc; b=FCYHnRPxdcYvppv5RZmfi5Jd7uvatiioBjShoC6TcU6on0X5gHIR0wEawOAWcMb8PXIMaKyX37SRzMolCs+kLDOG71bnbClC2JWm+rit08XxQfVpDfxwlGk2skBxWTbMb6keOXBIcykcGL2FZygtWQgwFooqWRP4i9mB6D2mOGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569578049; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=/B6ElQ+Cda/Y+/QHVqEXyF+ke1jS3x9dzT4vJiiewEY=; b=LDguVYG1Fe8vk6wYjdBFAZxujjOJ7cW9BFndphCHY4vueaVxmZQDkm0cRQojpDynG0BrC9Rz2v5eItNJ0lcQO9MgLYJGriZWPfJLv9nP+7B0kc3II0Z3VI1T0FM5Xcc2mOYS9WsWO+XmLs67I4U7OgvmI3havYb69uQHVuJ6Eag= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1569578049770297.73106499651317; Fri, 27 Sep 2019 02:54:09 -0700 (PDT) Received: from localhost ([::1]:49060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmwy-00061s-JO for importer@patchew.org; Fri, 27 Sep 2019 05:54:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33513) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmmW-0003cA-P3 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDmmV-0007vk-Cg for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49294) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDmmT-0007pZ-6D; Fri, 27 Sep 2019 05:43:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72A633082A8D; Fri, 27 Sep 2019 09:43:16 +0000 (UTC) Received: from localhost (ovpn-204-76.brq.redhat.com [10.40.204.76]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C3AB60BE2; Fri, 27 Sep 2019 09:43:15 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 13/18] iotests: Make 091 work with data_file Date: Fri, 27 Sep 2019 11:42:37 +0200 Message-Id: <20190927094242.11152-14-mreitz@redhat.com> In-Reply-To: <20190927094242.11152-1-mreitz@redhat.com> References: <20190927094242.11152-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 27 Sep 2019 09:43:16 +0000 (UTC) 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: 209.132.183.28 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" Content-Type: text/plain; charset="utf-8" The image end offset as reported by qemu-img check is different when using an external data file; we do not care about its value here, so we can just filter it. Signed-off-by: Max Reitz --- tests/qemu-iotests/091 | 3 ++- tests/qemu-iotests/091.out | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index f4b44659ae..7536ca4607 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -101,7 +101,8 @@ echo "Check image pattern" ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filte= r_qemu_io =20 echo "Running 'qemu-img check -r all \$TEST_IMG'" -"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_= qemu +"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_= qemu \ + | sed '/Image end offset/d' =20 echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out index 5017f8c2d9..343fac69e0 100644 --- a/tests/qemu-iotests/091.out +++ b/tests/qemu-iotests/091.out @@ -24,5 +24,4 @@ read 4194304/4194304 bytes at offset 0 Running 'qemu-img check -r all $TEST_IMG' No errors were found on the image. 80/16384 =3D 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters -Image end offset: 5570560 *** done --=20 2.21.0