From patchwork Tue Jul 31 15:38:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 174271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 382122C00CB for ; Wed, 1 Aug 2012 01:39:50 +1000 (EST) Received: from localhost ([::1]:42487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwEY0-0006Vr-99 for incoming@patchwork.ozlabs.org; Tue, 31 Jul 2012 11:39:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwEWx-0003Xo-1r for qemu-devel@nongnu.org; Tue, 31 Jul 2012 11:38:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwEWq-0001l9-Gm for qemu-devel@nongnu.org; Tue, 31 Jul 2012 11:38:42 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:56673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwEWq-0001ki-7W for qemu-devel@nongnu.org; Tue, 31 Jul 2012 11:38:36 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 31 Jul 2012 16:38:35 +0100 Received: from d06nrmr1507.portsmouth.uk.ibm.com (9.149.38.233) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 31 Jul 2012 16:38:32 +0100 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6VFcWnb3137716 for ; Tue, 31 Jul 2012 16:38:32 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6VFcVdT025688 for ; Tue, 31 Jul 2012 09:38:31 -0600 Received: from localhost (dyn-9-174-219-145.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6VFcVgx025671; Tue, 31 Jul 2012 09:38:31 -0600 From: Stefan Hajnoczi To: Date: Tue, 31 Jul 2012 16:38:21 +0100 Message-Id: <1343749101-4852-5-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343749101-4852-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1343749101-4852-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12073115-5024-0000-0000-00000362C769 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.107 Cc: Kevin Wolf , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 4/4] qemu-iotests: skip 039 with ./check -nocache 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 When the qemu-io --nocache option is used the 039 test case cannot abort QEMU at a point where the image is dirty. Skip the test case. Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/039 | 1 + tests/qemu-iotests/common.rc | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index a749fcf..c5ae806 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -44,6 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic _supported_os Linux +_unsupported_qemu_io_options --nocache size=128M diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 7782808..c5129f4 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -297,6 +297,20 @@ _supported_os() _notrun "not suitable for this OS: $HOSTOS" } +_unsupported_qemu_io_options() +{ + for bad_opt + do + for opt in $QEMU_IO_OPTIONS + do + if [ "$bad_opt" = "$opt" ] + then + _notrun "not suitable for qemu-io option: $bad_opt" + fi + done + done +} + # this test requires that a specified command (executable) exists # _require_command()