From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFP-0006IV-L0 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lFD-0003gU-V9 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFD-0003fG-ND for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:07 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:18:04 +0100 Message-Id: <1330528688-21996-24-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 23/27] qemu-iotests: 026: Reduce output changes for cache=none qcow2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org qemu-iotests supports the -nocache option which makes the tests run with cache=none. For blkdebug tests with qcow2 this means that we may see test results that differ from cache=writethrough. This patch makes the diff a bit smaller and therefore easier to review. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- tests/qemu-iotests/026 | 6 ++++++ tests/qemu-iotests/check | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 33e7da6..1602ccd 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -87,6 +87,12 @@ _make_test_img 1G echo echo "Event: $event; errno: $errno; imm: $imm; once: $once; write $vmstate" + +# We want to catch a simple L2 update, not the allocation of the first L2 table +if [ "$event" == "l2_update" ]; then + $QEMU_IO -c "write $vmstate 0 512" $TEST_IMG > /dev/null 2>&1 +fi + $QEMU_IO -c "write $vmstate 0 128k " $BLKDBG_TEST_IMG | _filter_qemu_io # l2_load is not called on allocation, so issue a second write diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 8499a04..aae1378 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 $seq.out $tmp.out >/dev/null 2>&1 + if diff -w $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 $seq.out $seq.out.bad + $diff -w $seq.out $seq.out.bad err=true fi fi -- 1.7.6.5