From patchwork Thu Nov 27 11:08:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Mueller X-Patchwork-Id: 415453 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 79A941401D0 for ; Thu, 27 Nov 2014 22:09:20 +1100 (AEDT) Received: from localhost ([::1]:38807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtwwk-0005Om-Aj for incoming@patchwork.ozlabs.org; Thu, 27 Nov 2014 06:09:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtwwI-00056Y-LC for qemu-devel@nongnu.org; Thu, 27 Nov 2014 06:08:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtwwA-0000g6-1q for qemu-devel@nongnu.org; Thu, 27 Nov 2014 06:08:46 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:44575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtww9-0000fw-Pm for qemu-devel@nongnu.org; Thu, 27 Nov 2014 06:08:37 -0500 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Nov 2014 11:08:36 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 27 Nov 2014 11:08:34 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7BC631B0805F for ; Thu, 27 Nov 2014 11:08:49 +0000 (GMT) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sARB8Yvn20512990 for ; Thu, 27 Nov 2014 11:08:34 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sARB8Xlw019363 for ; Thu, 27 Nov 2014 04:08:33 -0700 Received: from bee (dyn-9-152-224-181.boeblingen.de.ibm.com [9.152.224.181]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sARB8WHg019341; Thu, 27 Nov 2014 04:08:32 -0700 Date: Thu, 27 Nov 2014 12:08:31 +0100 From: Michael Mueller To: Max Reitz Message-ID: <20141127120831.66e0b980@bee> In-Reply-To: <5476EF39.9010700@redhat.com> References: <1415875021-15248-1-git-send-email-maochuan@linux.vnet.ibm.com> <5476EF39.9010700@redhat.com> Organization: IBM X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14112711-0025-0000-0000-0000029DE8F2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.112 Cc: Kevin Wolf , Mao Chuan Li , qemu-devel@nongnu.org, Alexander Graf , Christian Borntraeger , Stefan Hajnoczi , Cornelia Huck Subject: Re: [Qemu-devel] [PATCH v1 RFC 0/9] Update tests/qemu-iotests cases for multi-platform support 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Thu, 27 Nov 2014 10:30:33 +0100 Max Reitz wrote: > On 2014-11-13 at 11:36, Mao Chuan Li wrote: > > Currently the qemu-iotest framework is focused on the x86 platform. The suite should be > > usable by other platforms as well. To enable multi-platform usage, this patch set enhances > > the framework scripts to address this. By using the default machine type of the platform one > > can add specific output files if it deviates from the default. Secondly, single test cases > > can be adjusted as well when e.g. devices have different names or are not supported at all. > > > > Mao Chuan Li (9): > > qemu-iotests: run qemu with -nodefaults > > qemu-iotests: qemu machine type support > > qemu-iotests: add core_pattern access functions > > qemu-iotests: fix test 039 > > > qemu-iotests: s390x: fix test 071 > > qemu-iotests: s390x: fix test 087 > > To me, the main difference between the current test output and the new > s390-specific seems to be lines about CD and floppy disk; due to patch > 1, they are gone from x86 as well, though. Therefore, we don't need > special s390 output, but need to apply the changes directly to 071.out > and 087.out. perfect, that's fully in our interest. > > Furthermore, after patch 1, tests 067 and 091 fail for me on x86, too. I > don't know why 091 fails, but 067 fails because CD and floppy are > missing from the block-query result and the DEVICE_TRAY_MOVED events are > missing from QMP output in general (which is completely fine, we just > need to adjust the reference output accordingly). > > Max > > > qemu-iotests: s390x: fix test 041 > > qemu-iotests: s390x: fix test 055 > > qemu-iotests: s390x: fix test 051 > We have two more test 060 and 082 that fail with the following difference to the reference output. We analyzed it and it turns out that the size on disk is file system dependent. In our case it ran on a s390/ext3. Thus we think comparing the size on disk should be filtered. With other file system like ext4 or tmpfs we get also 196K. We don't want to enforce a specific file system to be used. 060 - output mismatch (see 060.out.bad) --- /home/mimu/prog/qemu/tests/qemu-iotests/060.out 2014-11-07 09:34:09.106410738 +0100 +++ 060.out.bad 2014-11-27 11:32:43.342907638 +0100 @@ -14,7 +14,7 @@ image: TEST_DIR/t.qcow2 file format: qcow2 virtual size: 64M (67108864 bytes) -disk size: 196K +disk size: 200K cluster_size: 65536 Format specific information: compat: 1.1 Would this be excaptable with replacing the out file diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 9772d36..3f608ed 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -77,7 +77,7 @@ $QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features # This information should be available through qemu-img info -$QEMU_IMG info "$TEST_IMG" | _filter_testdir +$QEMU_IMG info "$TEST_IMG" | _filter_testdir | _filter_disk_size # Try to open the image R/W (which should fail) $QEMU_IO -c "$OPEN_RW" -c "read 0 512" 2>&1 | _filter_qemu_io \ diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 3acdb30..fe6729d 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -220,5 +220,10 @@ _filter_qemu_img_map() -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt } +_filter_disk_size() +{ + sed -e '/^disk size: .*$/d' +} + # make sure this script returns success /bin/true