From patchwork Sun Jan 5 17:22:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 306990 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 4ED232C00CD for ; Mon, 6 Jan 2014 04:28:24 +1100 (EST) Received: from localhost ([::1]:58776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrUs-0006YU-4H for incoming@patchwork.ozlabs.org; Sun, 05 Jan 2014 12:28:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrR7-000180-D9 for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzrR1-0002vP-Qw for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:29 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:38964 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrR1-0002v7-Gi for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:23 -0500 Received: (qmail 32553 invoked by uid 89); 5 Jan 2014 17:24:22 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/18317. hbedv: 8.2.12.166/7.11.123.168. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 11.005412 secs); 05 Jan 2014 17:24:22 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 5 Jan 2014 17:24:11 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 6AC88206B8; Sun, 5 Jan 2014 18:20:40 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id E59A8611B3; Sun, 5 Jan 2014 18:22:17 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sun, 5 Jan 2014 18:22:04 +0100 Message-Id: <1388942528-10453-15-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1388942528-10453-1-git-send-email-pl@kamp.de> References: <1388942528-10453-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: Kevin Wolf , Fam Zheng , ronniesahlberg@gmail.com, Jeff Cody , Peter Lieven , Max Reitz , owasserm@redhat.com, Federico Simoncelli , Stefan Hajnoczi , Wenchao Xia Subject: [Qemu-devel] [PATCHv2 14/18] qemu-iotests: fix test 043 to work with any protocol 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 Signed-off-by: Peter Lieven --- tests/qemu-iotests/043 | 24 ++++++++++-------------- tests/qemu-iotests/043.out | 12 ++++++------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index b316b97..4c9e930 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -31,7 +31,9 @@ status=1 # failure is the default! _cleanup() { _cleanup_test_img - rm -f "$TEST_IMG".[123].base + if [ $IMGPROTO = "file" ]; then + rm -f "$TEST_IMG".[123].base + fi } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -41,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qcow2 qed -_supported_proto file +_supported_proto generic _supported_os Linux @@ -53,8 +55,7 @@ echo echo "== backing file references self ==" _img_info --backing-chain -_make_test_img $size -mv "$TEST_IMG" "$TEST_IMG.base" +TEST_IMG=$TEST_IMG.base _make_test_img $size _make_test_img -b "$TEST_IMG.base" $size $QEMU_IMG rebase -u -b "$TEST_IMG" "$TEST_IMG.base" @@ -62,12 +63,9 @@ echo echo "== parent references self ==" _img_info --backing-chain -_make_test_img $size -mv "$TEST_IMG" "$TEST_IMG.1.base" -_make_test_img -b "$TEST_IMG.1.base" $size -mv "$TEST_IMG" "$TEST_IMG.2.base" -_make_test_img -b "$TEST_IMG.2.base" $size -mv "$TEST_IMG" "$TEST_IMG.3.base" +TEST_IMG=$TEST_IMG.1.base _make_test_img $size +TEST_IMG=$TEST_IMG.2.base _make_test_img -b "$TEST_IMG.1.base" $size +TEST_IMG=$TEST_IMG.3.base _make_test_img -b "$TEST_IMG.2.base" $size _make_test_img -b "$TEST_IMG.3.base" $size $QEMU_IMG rebase -u -b "$TEST_IMG.2.base" "$TEST_IMG.1.base" @@ -75,10 +73,8 @@ echo echo "== ancestor references another ancestor ==" _img_info --backing-chain -_make_test_img $size -mv "$TEST_IMG" "$TEST_IMG.1.base" -_make_test_img -b "$TEST_IMG.1.base" $size -mv "$TEST_IMG" "$TEST_IMG.2.base" +TEST_IMG=$TEST_IMG.1.base _make_test_img $size +TEST_IMG=$TEST_IMG.2.base _make_test_img -b "$TEST_IMG.1.base" $size _make_test_img -b "$TEST_IMG.2.base" $size echo diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out index ad23337..3a7cef8 100644 --- a/tests/qemu-iotests/043.out +++ b/tests/qemu-iotests/043.out @@ -3,20 +3,20 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 == backing file references self == qemu-img: Backing file 'TEST_DIR/t.IMGFMT' creates an infinite loop. -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.base' == parent references self == qemu-img: Backing file 'TEST_DIR/t.IMGFMT' creates an infinite loop. -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.1.base' -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.2.base' +Formatting 'TEST_DIR/t.IMGFMT.1.base', fmt=IMGFMT size=134217728 +Formatting 'TEST_DIR/t.IMGFMT.2.base', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.1.base' +Formatting 'TEST_DIR/t.IMGFMT.3.base', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.2.base' Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.3.base' == ancestor references another ancestor == qemu-img: Backing file 'TEST_DIR/t.IMGFMT.2.base' creates an infinite loop. -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.1.base' +Formatting 'TEST_DIR/t.IMGFMT.1.base', fmt=IMGFMT size=134217728 +Formatting 'TEST_DIR/t.IMGFMT.2.base', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.1.base' Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file='TEST_DIR/t.IMGFMT.2.base' == finite chain of length 3 (human) ==