diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-11-20 16:27:07 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-12-10 10:31:12 +0100 |
| commit | 8f9e835fd2e687d2bfe936819c3494af4343614d (patch) | |
| tree | 03199674e57f9fc28c9c3ffe4cbb7fbf837a4755 /tests/qemu-iotests/081 | |
| parent | be6273da9e31d30fc95a65b09a0b819a89f1cc62 (diff) | |
| download | qemu-8f9e835fd2e687d2bfe936819c3494af4343614d.zip qemu-8f9e835fd2e687d2bfe936819c3494af4343614d.tar.gz qemu-8f9e835fd2e687d2bfe936819c3494af4343614d.tar.bz2 | |
qemu-iotests: Use qemu-io -f $IMGFMT
This patch changes $QEMU_IO so that all tests by default pass a format
argument to qemu-io.
There are a few cases where -f $IMGFMT is not wanted because it selects
the wrong driver or json: filenames including a driver are used. They
are changed to use $QEMU_IO_PROG, which doesn't include any options.
Tests 071 and 081 have output changes because now the actual request
fails instead of reading the 2k probing buffer.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1416497234-29880-3-git-send-email-kwolf@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/081')
| -rwxr-xr-x | tests/qemu-iotests/081 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index ed3c29e..9ab93ff 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -59,9 +59,13 @@ function run_qemu() test_quorum=$($QEMU_IMG --help|grep quorum) [ "$test_quorum" = "" ] && _supported_fmt quorum -quorum="file.driver=quorum,file.children.0.file.filename=$TEST_DIR/1.raw" +quorum="driver=raw,file.driver=quorum,file.vote-threshold=2" +quorum="$quorum,file.children.0.file.filename=$TEST_DIR/1.raw" quorum="$quorum,file.children.1.file.filename=$TEST_DIR/2.raw" -quorum="$quorum,file.children.2.file.filename=$TEST_DIR/3.raw,file.vote-threshold=2" +quorum="$quorum,file.children.2.file.filename=$TEST_DIR/3.raw" +quorum="$quorum,file.children.0.driver=raw" +quorum="$quorum,file.children.1.driver=raw" +quorum="$quorum,file.children.2.driver=raw" echo echo "== creating quorum files ==" |