mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-iotests: 026: Reduce output changes for cache=none qcow2

Browse Source 
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 <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Kevin Wolf 2011-04-29 15:32:55 +02:00
parent a06d5cc20b
commit 92ab69b61f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/026
View File

@ -87,6 +87,12 @@ _make_test_img 1G
echo echo
echo "Event: $event; errno: $errno; imm: $imm; once: $once; write $vmstate" 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 $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 # l2_load is not called on allocation, so issue a second write

4
tests/qemu-iotests/check
View File

@ -243,7 +243,7 @@ do
echo " - no qualified output" echo " - no qualified output"
err=true err=true
else else
if diff $seq.out $tmp.out >/dev/null 2>&1 if diff -w $seq.out $tmp.out >/dev/null 2>&1
then then
echo "" echo ""
if $err if $err
@ -255,7 +255,7 @@ do
else else
echo " - output mismatch (see $seq.out.bad)" echo " - output mismatch (see $seq.out.bad)"
mv $tmp.out $seq.out.bad mv $tmp.out $seq.out.bad
$diff $seq.out $seq.out.bad $diff -w $seq.out $seq.out.bad
err=true err=true
fi fi
fi fi