diff options
| author | Fam Zheng <famz@redhat.com> | 2015-12-22 10:49:11 +0800 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-01-07 21:30:17 +0100 |
| commit | 9b337ae90a395c3f5d79716cd160167734b8a609 (patch) | |
| tree | 73e6ed01eb388d48fa3d7eea204fd76e94ebab97 /tests/qemu-iotests | |
| parent | 0fa296eb005240ec9e9bd7bef4be850f5048365a (diff) | |
| download | qemu-9b337ae90a395c3f5d79716cd160167734b8a609.tar.gz | |
iotests: 018: Use TEST_IMG override instead of "mv"
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1450752561-9300-2-git-send-email-famz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rwxr-xr-x | tests/qemu-iotests/018 | 8 | ||||
| -rw-r--r-- | tests/qemu-iotests/018.out | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index d8a7d435ab..07b2de970e 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -66,8 +66,8 @@ _check_test_img echo "Creating test image with backing file" echo -TEST_IMG=$TEST_IMG_SAVE -_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 @@ -81,8 +81,8 @@ for offset in $TEST_OFFSETS; do done _check_test_img -mv "$TEST_IMG" "$TEST_IMG.orig" -$QEMU_IMG convert -O $IMGFMT "$TEST_IMG.orig" "$TEST_IMG" +TEST_IMG="$TEST_IMG_SAVE" +$QEMU_IMG convert -f $IMGFMT -O $IMGFMT "$TEST_IMG.orig" "$TEST_IMG" echo "Reading" echo diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out index d66bd63434..5df966727f 100644 --- a/tests/qemu-iotests/018.out +++ b/tests/qemu-iotests/018.out @@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4295032832 No errors were found on the image. Creating test image with backing file -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base Filling test image === IO: pattern 1 |