diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-02 14:47:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-02 14:47:10 +0100 |
| commit | 37dd86a44cc4298f58ac370e0190b069469b6d25 (patch) | |
| tree | 8402b957686a90af0310701e08cbc4319da12749 /tests | |
| parent | ff770b07f34d28b79013a83989bd6c85f8f16b2f (diff) | |
| parent | 73ba05d936e82fe01b2b2cf987bf3aecb4792af5 (diff) | |
| download | focaccia-qemu-37dd86a44cc4298f58ac370e0190b069469b6d25.tar.gz focaccia-qemu-37dd86a44cc4298f58ac370e0190b069469b6d25.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches # gpg: Signature made Fri 02 Oct 2015 12:49:13 BST using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: block/raw-posix: Open file descriptor O_RDWR to work around glibc posix_fallocate emulation issue. block: disable I/O limits at the beginning of bdrv_close() iotests: Fix test 128 for password-less sudo tests: Fix test 049 fallout from improved HMP error messages raw-win32: Fix write request error handling Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/049.out | 1 | ||||
| -rwxr-xr-x | tests/qemu-iotests/128 | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out index 0425ae05e8..a2b6703956 100644 --- a/tests/qemu-iotests/049.out +++ b/tests/qemu-iotests/049.out @@ -118,6 +118,7 @@ qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes. qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2 qemu-img: Parameter 'size' expects a size +You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes. qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2' == Check correct interpretation of suffixes for cluster size == diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index e2a0f2f890..3d8107d2a3 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -31,6 +31,11 @@ status=1 # failure is the default! devname="eiodev$$" sudo="" +_sudo_qemu_io_wrapper() +{ + (exec $sudo "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@") +} + _setup_eiodev() { # This test should either be run as root or with passwordless sudo @@ -76,7 +81,9 @@ TEST_IMG="/dev/mapper/$devname" echo echo "== reading from error device ==" # Opening image should succeed but the read operation should fail -$sudo $QEMU_IO --format "$IMGFMT" --nocache -c "read 0 65536" "$TEST_IMG" | _filter_qemu_io +_sudo_qemu_io_wrapper --format "$IMGFMT" --nocache \ + -c "read 0 65536" "$TEST_IMG" \ + | _filter_qemu_io # success, all done echo "*** done" |