From nobody Mon Feb 9 16:18:33 2026 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; dkim=fail; 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=1573145516; cv=none; d=zoho.com; s=zohoarc; b=F0SEpRHN8JkyOY6CjhsK/SObauB3ci+ilV/sIuhhElsYBencStZA/hEuv2rEzFoRq3wRwA5blaLKeiMcWF71P/ZwSqgs9Oi89mKp9kYoRfZxfA1l4Dl+hdJGmghlr8iBWxenu+pIc/T+l2y7w7E7BIozy07JH2FfXX4c6pANnhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573145516; h=Content-Type: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; bh=awLUt2VRa5uJkmyT69ZebZN8Ga9wR6YN2HYCShPvMNk=; b=ZdWZq+VRVG0q5+Epww3B6GECnf1lgZtvj8NcSo8mx1zcClKZq/wahtHgIjZfXGR9L1lSF2wily2+kjhhF6VEbHTgTuMRSBedSuylj/L1PodtczbxLprLowkyFBrFtkZPZbV/nwDmD9SW8e0N4ZW5vI2ykb7k7WmX3N8ajd7a/8c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 1573145516051659.2665382443853; Thu, 7 Nov 2019 08:51:56 -0800 (PST) Received: from localhost ([::1]:45488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSl0j-0003a5-Mt for importer@patchew.org; Thu, 07 Nov 2019 11:51:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42789) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSknA-0003SJ-Sb for qemu-devel@nongnu.org; Thu, 07 Nov 2019 11:37:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSkn9-0005nY-Oj for qemu-devel@nongnu.org; Thu, 07 Nov 2019 11:37:52 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49336 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iSkn9-0005nJ-Lk for qemu-devel@nongnu.org; Thu, 07 Nov 2019 11:37:51 -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-331-30rUHXXhO4S3Fk7SDu7cKA-1; Thu, 07 Nov 2019 11:37:47 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CF81B8017DD; Thu, 7 Nov 2019 16:37:46 +0000 (UTC) Received: from localhost (ovpn-117-149.ams2.redhat.com [10.36.117.149]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6981A1001B34; Thu, 7 Nov 2019 16:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573144671; 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: in-reply-to:in-reply-to:references:references; bh=awLUt2VRa5uJkmyT69ZebZN8Ga9wR6YN2HYCShPvMNk=; b=i7b698ydfM04BiSezFdLSQhzigSpbsLiSonEe6yJBO8QeNcyWQBuZcgscw7+4tIP57N8VB dB7YsxCYzQiyfewTjgxLUkKByzn4FoybB4k4T2AN0Hv9KezOXTjSp7oOwMYIHS+lmOzT/e aTb3ltFs0/ZErj868cIuUpDQYGjd7kY= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 17/22] iotests: Make 091 work with data_file Date: Thu, 7 Nov 2019 17:37:03 +0100 Message-Id: <20191107163708.833192-18-mreitz@redhat.com> In-Reply-To: <20191107163708.833192-1-mreitz@redhat.com> References: <20191107163708.833192-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 30rUHXXhO4S3Fk7SDu7cKA-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: 207.211.31.120 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 , Maxim Levitsky , 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" 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. Incidentally, common.rc already has _check_test_img for us which does exactly that. Signed-off-by: Max Reitz Reviewed-by: Maxim Levitsky --- tests/qemu-iotests/091 | 2 +- tests/qemu-iotests/091.out | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index f4b44659ae..0874fa84c8 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -101,7 +101,7 @@ 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 +_check_test_img -r all =20 echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out index 5017f8c2d9..5ec7b00f13 100644 --- a/tests/qemu-iotests/091.out +++ b/tests/qemu-iotests/091.out @@ -23,6 +23,4 @@ read 4194304/4194304 bytes at offset 0 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 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.23.0