From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfgVb-0000uS-Nt for qemu-devel@nongnu.org; Sun, 10 Nov 2013 20:41:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VfgVR-0001t7-2Q for qemu-devel@nongnu.org; Sun, 10 Nov 2013 20:41:43 -0500 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:43069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfgVQ-0001sp-EZ for qemu-devel@nongnu.org; Sun, 10 Nov 2013 20:41:32 -0500 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Nov 2013 11:41:28 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 7BC162BB0052 for ; Mon, 11 Nov 2013 12:41:25 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAB1NnlS5833152 for ; Mon, 11 Nov 2013 12:23:49 +1100 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rAB1fOec028747 for ; Mon, 11 Nov 2013 12:41:25 +1100 Message-ID: <528035C8.8060800@linux.vnet.ibm.com> Date: Mon, 11 Nov 2013 09:41:28 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1381458811-9854-1-git-send-email-xiawenc@linux.vnet.ibm.com> <1381458811-9854-6-git-send-email-xiawenc@linux.vnet.ibm.com> <20131108171851.GE19612@localhost.localdomain> In-Reply-To: <20131108171851.GE19612@localhost.localdomain> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH V4 5/5] qemu-iotests: add test for snapshot in qemu-img convert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, stefanha@gmail.com 于 2013/11/9 1:18, Jeff Cody 写道: > On Fri, Oct 11, 2013 at 10:33:31AM +0800, Wenchao Xia wrote: >> Signed-off-by: Wenchao Xia >> --- >> tests/qemu-iotests/058 | 19 ++++++++++++++++++- >> tests/qemu-iotests/058.out | 12 ++++++++++++ >> 2 files changed, 30 insertions(+), 1 deletions(-) >> >> diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 >> index 5b821cf..d4987ae 100755 >> --- a/tests/qemu-iotests/058 >> +++ b/tests/qemu-iotests/058 >> @@ -1,6 +1,6 @@ >> #!/bin/bash >> # >> -# Test export internal snapshot by qemu-nbd. >> +# Test export internal snapshot by qemu-nbd, convert it by qemu-img. >> # >> # Copyright (C) 2013 IBM, Inc. >> # >> @@ -33,6 +33,8 @@ status=1 # failure is the default! >> nbd_snapshot_port=10850 >> nbd_snapshot_img="nbd:127.0.0.1:$nbd_snapshot_port" >> >> +converted_image=$TEST_IMG.converted >> + >> _export_nbd_snapshot() >> { >> $QEMU_NBD -v -t -b 127.0.0.1 -p $nbd_snapshot_port "$TEST_IMG" -l $1 & >> @@ -53,6 +55,7 @@ _cleanup() >> kill $NBD_SNAPSHOT_PID >> fi >> _cleanup_test_img >> + rm -f $converted_image > > Please quote $converted_image (especially with rm -f) - it is also > used unquoted later on in this file, as well. > >> } >> trap "_cleanup; exit \$status" 0 1 2 3 15 >> >> @@ -96,6 +99,20 @@ echo "== verifying the exported snapshot with patterns ==" >> $QEMU_IO -c 'read -P 0xa 0x1000 0x1000' $nbd_snapshot_img | _filter_qemu_io >> $QEMU_IO -c 'read -P 0xb 0x2000 0x1000' $nbd_snapshot_img | _filter_qemu_io >> >> +$QEMU_IMG convert $TEST_IMG -l sn1 -O qcow2 $converted_image > > $TEST_IMG needs quoting here, and again below > Thanks for reviewing, will rebase with the quote issue fixed. >> + >> +echo >> +echo "== verifying the converted snapshot with patterns ==" >> +$QEMU_IO -c 'read -P 0xa 0x1000 0x1000' $converted_image | _filter_qemu_io >> +$QEMU_IO -c 'read -P 0xb 0x2000 0x1000' $converted_image | _filter_qemu_io >> + >> +$QEMU_IMG convert $TEST_IMG -l snapshot.name=sn1 -O qcow2 $converted_image >> + >> +echo >> +echo "== verifying the converted snapshot with patterns ==" >> +$QEMU_IO -c 'read -P 0xa 0x1000 0x1000' $converted_image | _filter_qemu_io >> +$QEMU_IO -c 'read -P 0xb 0x2000 0x1000' $converted_image | _filter_qemu_io >> + >> # success, all done >> echo "*** done" >> rm -f $seq.full >> diff --git a/tests/qemu-iotests/058.out b/tests/qemu-iotests/058.out >> index cc4b8ca..a8381b9 100644 >> --- a/tests/qemu-iotests/058.out >> +++ b/tests/qemu-iotests/058.out >> @@ -29,4 +29,16 @@ read 4096/4096 bytes at offset 4096 >> 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> read 4096/4096 bytes at offset 8192 >> 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> + >> +== verifying the converted snapshot with patterns == >> +read 4096/4096 bytes at offset 4096 >> +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> +read 4096/4096 bytes at offset 8192 >> +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> + >> +== verifying the converted snapshot with patterns == >> +read 4096/4096 bytes at offset 4096 >> +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> +read 4096/4096 bytes at offset 8192 >> +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> *** done >> -- >> 1.7.1 >> >> >