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>
			
			
This commit is contained in:
		
							parent
							
								
									dbcdd7cb04
								
							
						
					
					
						commit
						794d00f71d
					
				| 
						 | 
					@ -46,6 +46,8 @@ _supported_os Linux
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_OFFSETS="0 4294967296"
 | 
					TEST_OFFSETS="0 4294967296"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_IMG_SAVE=$TEST_IMG
 | 
				
			||||||
 | 
					TEST_IMG=$TEST_IMG.base
 | 
				
			||||||
_make_test_img 6G
 | 
					_make_test_img 6G
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Filling base image"
 | 
					echo "Filling base image"
 | 
				
			||||||
| 
						 | 
					@ -63,7 +65,7 @@ _check_test_img
 | 
				
			||||||
echo "Creating test image with backing file"
 | 
					echo "Creating test image with backing file"
 | 
				
			||||||
echo
 | 
					echo
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mv $TEST_IMG $TEST_IMG.base
 | 
					TEST_IMG=$TEST_IMG_SAVE
 | 
				
			||||||
_make_test_img -b $TEST_IMG.base 6G
 | 
					_make_test_img -b $TEST_IMG.base 6G
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Filling test image"
 | 
					echo "Filling test image"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
QA output created by 017
 | 
					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
 | 
					Filling base image
 | 
				
			||||||
 | 
					
 | 
				
			||||||
=== IO: pattern 0
 | 
					=== IO: pattern 0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,6 +46,8 @@ _supported_os Linux
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_OFFSETS="0 4294967296"
 | 
					TEST_OFFSETS="0 4294967296"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_IMG_SAVE=$TEST_IMG
 | 
				
			||||||
 | 
					TEST_IMG=$TEST_IMG.base
 | 
				
			||||||
_make_test_img 6G
 | 
					_make_test_img 6G
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Filling base image"
 | 
					echo "Filling base image"
 | 
				
			||||||
| 
						 | 
					@ -63,7 +65,7 @@ _check_test_img
 | 
				
			||||||
echo "Creating test image with backing file"
 | 
					echo "Creating test image with backing file"
 | 
				
			||||||
echo
 | 
					echo
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mv $TEST_IMG $TEST_IMG.base
 | 
					TEST_IMG=$TEST_IMG_SAVE
 | 
				
			||||||
_make_test_img -b $TEST_IMG.base 6G
 | 
					_make_test_img -b $TEST_IMG.base 6G
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Filling test image"
 | 
					echo "Filling test image"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
QA output created by 018
 | 
					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
 | 
					Filling base image
 | 
				
			||||||
 | 
					
 | 
				
			||||||
=== IO: pattern 0
 | 
					=== IO: pattern 0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue