From patchwork Tue Jan 26 10:38:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8120181 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AA33FBEEE5 for ; Tue, 26 Jan 2016 10:47:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2353020256 for ; Tue, 26 Jan 2016 10:47:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7805020166 for ; Tue, 26 Jan 2016 10:47:34 +0000 (UTC) Received: from localhost ([::1]:43002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO19p-00059T-Uk for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 05:47:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO13A-0007vn-E9 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:40:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO139-0007en-KK for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:40:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO135-0007e4-Bb; Tue, 26 Jan 2016 05:40:35 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E9A151C5F42; Tue, 26 Jan 2016 10:40:34 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-5-65.pek2.redhat.com [10.72.5.65]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0QAcRTO016464; Tue, 26 Jan 2016 05:40:27 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:38:22 +0800 Message-Id: <1453804705-7205-14-git-send-email-famz@redhat.com> In-Reply-To: <1453804705-7205-1-git-send-email-famz@redhat.com> References: <1453804705-7205-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, jsnow@redhat.com, Markus Armbruster , mreitz@redhat.com, vsementsov@parallels.com, Stefan Hajnoczi Subject: [Qemu-devel] [RFC PATCH 13/16] iotests: Add qbm to case 097 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The output of "qemu-img map" will be slightly different for qbm because the data image paths are not $TEST_IMG, but the pattern is predicatable enough so we can just filter it out. Signed-off-by: Fam Zheng --- tests/qemu-iotests/095 | 2 +- tests/qemu-iotests/097 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index dad04b9..2f68953 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter . ./common.qemu -_supported_fmt qcow2 +_supported_fmt qcow2 qbm _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 index c7a613b..2252d62 100755 --- a/tests/qemu-iotests/097 +++ b/tests/qemu-iotests/097 @@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files and bdrv_make_empty -_supported_fmt qcow qcow2 +_supported_fmt qcow qcow2 qbm _supported_proto file _supported_os Linux @@ -109,9 +109,11 @@ else # Both top and intermediate should be unchanged fi +{ $QEMU_IMG map "$TEST_IMG.base" | _filter_qemu_img_map $QEMU_IMG map "$TEST_IMG.itmd" | _filter_qemu_img_map $QEMU_IMG map "$TEST_IMG" | _filter_qemu_img_map +} | sed -e 's/.data.img//' done