Commit 794d00f7 authored May 07, 2013 by Fam Zheng Committed by Kevin Wolf May 08, 2013

qemu-iotests: fix 017 018 for vmdk



017 and 018 use /bin/mv to move base img from t.IMGFMG to t.IMGFMT.base
after filling data, this is not enough for vmdk, when t.IMGFMT is only a
description text file who points to t-{flat,s001,f001,...}.IMGFMT as
data extent, so testing such subformats alway fails on them.

This patch use the trick of temprorily changing TEST_IMG to avoid using
/bin/mv.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

parent dbcdd7cb

tests/qemu-iotests/017

+3 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ _supported_os Linux

		TEST_OFFSETS="0 4294967296"

		TEST_IMG_SAVE=$TEST_IMG
		TEST_IMG=$TEST_IMG.base
		_make_test_img 6G

		echo "Filling base image"
		@@ -63,7 +65,7 @@ _check_test_img
		echo "Creating test image with backing file"
		echo

		mv $TEST_IMG $TEST_IMG.base
		TEST_IMG=$TEST_IMG_SAVE
		_make_test_img -b $TEST_IMG.base 6G

		echo "Filling test image"

tests/qemu-iotests/017.out

+1 −1

Original line number	Diff line number	Diff line
		QA output created by 017
		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944
		Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
		Filling base image

		=== IO: pattern 0

tests/qemu-iotests/018

+3 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ _supported_os Linux

		TEST_OFFSETS="0 4294967296"

		TEST_IMG_SAVE=$TEST_IMG
		TEST_IMG=$TEST_IMG.base
		_make_test_img 6G

		echo "Filling base image"
		@@ -63,7 +65,7 @@ _check_test_img
		echo "Creating test image with backing file"
		echo

		mv $TEST_IMG $TEST_IMG.base
		TEST_IMG=$TEST_IMG_SAVE
		_make_test_img -b $TEST_IMG.base 6G

		echo "Filling test image"

tests/qemu-iotests/018.out

+1 −1

Original line number	Diff line number	Diff line
		QA output created by 018
		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944
		Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
		Filling base image

		=== IO: pattern 0