Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
tests
/
qemu-iotests
/
019
diff --git
a/qemu/tests/qemu-iotests/019
b/qemu/tests/qemu-iotests/019
index
f5ecbf5
..
24a789a
100755
(executable)
--- a/
qemu/tests/qemu-iotests/019
+++ b/
qemu/tests/qemu-iotests/019
@@
-27,7
+27,6
@@
seq=`basename $0`
echo "QA output created by $seq"
here=`pwd`
echo "QA output created by $seq"
here=`pwd`
-tmp=/tmp/$$
status=1 # failure is the default!
_cleanup()
status=1 # failure is the default!
_cleanup()
@@
-54,6
+53,9
@@
_unsupported_imgopts "subformat=monolithicFlat" \
TEST_OFFSETS="0 4294967296"
CLUSTER_SIZE=65536
TEST_OFFSETS="0 4294967296"
CLUSTER_SIZE=65536
+TEST_IMG_SAVE="$TEST_IMG"
+TEST_IMG="$TEST_IMG.base"
+
_make_test_img 6G
echo "Filling base image"
_make_test_img 6G
echo "Filling base image"
@@
-71,8
+73,8
@@
_check_test_img
echo "Creating test image with backing file"
echo
echo "Creating test image with backing file"
echo
-
mv "$TEST_IMG" "$TEST_IMG.base
"
-_make_test_img -b "$TEST_IMG.base" 6G
+
TEST_IMG="$TEST_IMG_SAVE.orig
"
+_make_test_img -b "$TEST_IMG
_SAVE
.base" 6G
echo "Filling test image"
echo
echo "Filling test image"
echo
@@
-86,9
+88,7
@@
for offset in $TEST_OFFSETS; do
done
_check_test_img
done
_check_test_img
-mv "$TEST_IMG" "$TEST_IMG.orig"
-
-
+TEST_IMG="$TEST_IMG_SAVE"
# Test the conversion twice: One test with the old-style -B option and another
# one with -o backing_file
# Test the conversion twice: One test with the old-style -B option and another
# one with -o backing_file
@@
-98,7
+98,7
@@
for backing_option in "-B " "-o backing_file="; do
echo
echo Testing conversion with $backing_option"$TEST_IMG.base" | _filter_testdir | _filter_imgfmt
echo
echo
echo Testing conversion with $backing_option"$TEST_IMG.base" | _filter_testdir | _filter_imgfmt
echo
- $QEMU_IMG convert -O $IMGFMT $backing_option"$TEST_IMG.base" "$TEST_IMG.orig" "$TEST_IMG"
+ $QEMU_IMG convert -
f $IMGFMT -
O $IMGFMT $backing_option"$TEST_IMG.base" "$TEST_IMG.orig" "$TEST_IMG"
echo "Checking if backing clusters are allocated when they shouldn't"
echo
echo "Checking if backing clusters are allocated when they shouldn't"
echo