From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:43239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLpUV-00079X-Bt for qemu-devel@nongnu.org; Wed, 01 May 2019 09:41:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLpUS-0006Ns-A6 for qemu-devel@nongnu.org; Wed, 01 May 2019 09:41:43 -0400 From: Thomas Huth Date: Wed, 1 May 2019 15:41:27 +0200 Message-Id: <20190501134127.21104-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] tests/qemu-iotests: Fix more reference output files due to recent qemu-io change List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-devel@nongnu.org Cc: Max Reitz , qemu-block@nongnu.org The output of qemu-io changed recently - most tests have been fixed in commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io related tests") already, but the qcow1 and the vmdk test was still missin= g. Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()") Signed-off-by: Thomas Huth --- tests/qemu-iotests/059.out | 8 ++++---- tests/qemu-iotests/092.out | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 700ad1f290..f51394ae8e 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2,15 +2,15 @@ QA output created by 059 =20 =3D=3D=3D Testing invalid granularity =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.vmdk: Invalid granularity, image may be cor= rupt +qemu-io: can't open device TEST_DIR/t.vmdk: Invalid granularity, image m= ay be corrupt =20 =3D=3D=3D Testing too big L2 table size =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.vmdk: L2 table size too big +qemu-io: can't open device TEST_DIR/t.vmdk: L2 table size too big =20 =3D=3D=3D Testing too big L1 table size =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.vmdk: L1 size too big +qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big =20 =3D=3D=3D Testing monolithicFlat creation and opening =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2147483648 subformat= =3DmonolithicFlat @@ -2050,7 +2050,7 @@ wrote 512/512 bytes at offset 10240 =20 =3D=3D=3D Testing monolithicFlat with internally generated JSON file nam= e =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 subformat=3D= monolithicFlat -can't open: Cannot use relative extent paths with VMDK descriptor file '= json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driv= er": "blkdebug", "inject-error.0.event": "read_aio"}' +qemu-io: can't open: Cannot use relative extent paths with VMDK descript= or file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT= "}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}' =20 =3D=3D=3D Testing version 3 =3D=3D=3D image: TEST_DIR/iotest-version3.IMGFMT diff --git a/tests/qemu-iotests/092.out b/tests/qemu-iotests/092.out index 6eda321fc6..3e79914873 100644 --- a/tests/qemu-iotests/092.out +++ b/tests/qemu-iotests/092.out @@ -2,25 +2,25 @@ QA output created by 092 =20 =3D=3D Invalid cluster size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k =20 =3D=3D Invalid L2 table size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k =20 =3D=3D Invalid size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: Image too large -can't open device TEST_DIR/t.qcow: Image too large +qemu-io: can't open device TEST_DIR/t.qcow: Image too large +qemu-io: can't open device TEST_DIR/t.qcow: Image too large =20 =3D=3D Invalid backing file length =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: Backing file name too long -can't open device TEST_DIR/t.qcow: Backing file name too long +qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long +qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long *** done --=20 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D19CC43219 for ; Wed, 1 May 2019 13:42:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4EB520866 for ; Wed, 1 May 2019 13:42:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4EB520866 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:58560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLpVK-0007XI-6m for qemu-devel@archiver.kernel.org; Wed, 01 May 2019 09:42:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLpUV-00079X-Bt for qemu-devel@nongnu.org; Wed, 01 May 2019 09:41:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLpUS-0006Ns-A6 for qemu-devel@nongnu.org; Wed, 01 May 2019 09:41:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38712) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLpUL-0006KM-Sn; Wed, 01 May 2019 09:41:34 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 1D270C057E32; Wed, 1 May 2019 13:41:33 +0000 (UTC) Received: from thuth.com (ovpn-116-251.ams2.redhat.com [10.36.116.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A7011001DD1; Wed, 1 May 2019 13:41:31 +0000 (UTC) From: Thomas Huth To: Kevin Wolf , qemu-devel@nongnu.org Date: Wed, 1 May 2019 15:41:27 +0200 Message-Id: <20190501134127.21104-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 01 May 2019 13:41:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] tests/qemu-iotests: Fix more reference output files due to recent qemu-io change X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190501134127.NakXo88FaFLkCNGYCUlfezHuawSjklETLvznTxxrV38@z> The output of qemu-io changed recently - most tests have been fixed in commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io related tests") already, but the qcow1 and the vmdk test was still missin= g. Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()") Signed-off-by: Thomas Huth --- tests/qemu-iotests/059.out | 8 ++++---- tests/qemu-iotests/092.out | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 700ad1f290..f51394ae8e 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2,15 +2,15 @@ QA output created by 059 =20 =3D=3D=3D Testing invalid granularity =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.vmdk: Invalid granularity, image may be cor= rupt +qemu-io: can't open device TEST_DIR/t.vmdk: Invalid granularity, image m= ay be corrupt =20 =3D=3D=3D Testing too big L2 table size =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.vmdk: L2 table size too big +qemu-io: can't open device TEST_DIR/t.vmdk: L2 table size too big =20 =3D=3D=3D Testing too big L1 table size =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.vmdk: L1 size too big +qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big =20 =3D=3D=3D Testing monolithicFlat creation and opening =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2147483648 subformat= =3DmonolithicFlat @@ -2050,7 +2050,7 @@ wrote 512/512 bytes at offset 10240 =20 =3D=3D=3D Testing monolithicFlat with internally generated JSON file nam= e =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 subformat=3D= monolithicFlat -can't open: Cannot use relative extent paths with VMDK descriptor file '= json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driv= er": "blkdebug", "inject-error.0.event": "read_aio"}' +qemu-io: can't open: Cannot use relative extent paths with VMDK descript= or file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT= "}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}' =20 =3D=3D=3D Testing version 3 =3D=3D=3D image: TEST_DIR/iotest-version3.IMGFMT diff --git a/tests/qemu-iotests/092.out b/tests/qemu-iotests/092.out index 6eda321fc6..3e79914873 100644 --- a/tests/qemu-iotests/092.out +++ b/tests/qemu-iotests/092.out @@ -2,25 +2,25 @@ QA output created by 092 =20 =3D=3D Invalid cluster size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k -can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and = 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between= 512 and 64k =20 =3D=3D Invalid L2 table size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k -can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and= 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k +qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be betwee= n 512 and 64k =20 =3D=3D Invalid size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: Image too large -can't open device TEST_DIR/t.qcow: Image too large +qemu-io: can't open device TEST_DIR/t.qcow: Image too large +qemu-io: can't open device TEST_DIR/t.qcow: Image too large =20 =3D=3D Invalid backing file length =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -can't open device TEST_DIR/t.qcow: Backing file name too long -can't open device TEST_DIR/t.qcow: Backing file name too long +qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long +qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long *** done --=20 2.21.0