From patchwork Mon Apr 23 08:43:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 154347 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 07797B6F6E for ; Mon, 23 Apr 2012 18:25:47 +1000 (EST) Received: from localhost ([::1]:50355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMEae-0004TU-SA for incoming@patchwork.ozlabs.org; Mon, 23 Apr 2012 04:25:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMEaT-0004Sc-Nb for qemu-devel@nongnu.org; Mon, 23 Apr 2012 04:25:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMEaN-0006gk-Hs for qemu-devel@nongnu.org; Mon, 23 Apr 2012 04:25:33 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:34910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMEa1-0005wC-Lu for qemu-devel@nongnu.org; Mon, 23 Apr 2012 04:25:27 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 23 Apr 2012 13:54:46 +0530 Received: from d28relay04.in.ibm.com (9.184.220.61) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 23 Apr 2012 13:54:43 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3N8Ogku2723852 for ; Mon, 23 Apr 2012 13:54:42 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3NDrvrs028569 for ; Mon, 23 Apr 2012 23:53:57 +1000 Received: from kvm-rhel-01.localdomain ([9.181.129.59]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q3NDruOv028484; Mon, 23 Apr 2012 23:53:56 +1000 From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Mon, 23 Apr 2012 16:43:11 +0800 Message-Id: <1335170591-20545-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1.1 x-cbid: 12042308-3864-0000-0000-000002628CCA X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.3 Cc: kwolf@redhat.com, Dong Xu Wang , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] qemu-iotests: ignore fragmentation information for qed 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 We added image fragmentation statistics functions to qemu-img several days ago, those patches will cause "./check -qed" failed. This patch will ignore fragmentation statistics information of qed format, and then "./check -qed" will work. Signed-off-by: Dong Xu Wang --- tests/qemu-iotests/check | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index aae1378..b836780 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -243,7 +243,7 @@ do echo " - no qualified output" err=true else - if diff -w $seq.out $tmp.out >/dev/null 2>&1 + if diff -w -I "fragmented$" $seq.out $tmp.out >/dev/null 2>&1 then echo "" if $err @@ -255,7 +255,7 @@ do else echo " - output mismatch (see $seq.out.bad)" mv $tmp.out $seq.out.bad - $diff -w $seq.out $seq.out.bad + $diff -w -I "fragmented$" $seq.out $seq.out.bad err=true fi fi