[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] iotests: Fix test 128 for password-less sudo
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 3/5] iotests: Fix test 128 for password-less sudo |
Date: |
Fri, 2 Oct 2015 14:50:56 +0200 |
From: Max Reitz <address@hidden>
As of 934659c460d46c948cf348822fda1d38556ed9a4, $QEMU_IO is generally no
longer a program name, and therefore "sudo -n $QEMU_IO" will no longer
work.
Fix this by copying the qemu-io invocation function from common.config,
making it use $sudo for invoking $QEMU_IO_PROG, and then use that
function instead of $QEMU_IO.
Reported-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/128 | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128
index e2a0f2f..3d8107d 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"
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] Block layer patches, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PULL 1/5] raw-win32: Fix write request error handling, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PULL 4/5] block: disable I/O limits at the beginning of bdrv_close(), Kevin Wolf, 2015/10/08
- [Qemu-devel] [PULL 2/5] tests: Fix test 049 fallout from improved HMP error messages, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PULL 5/5] block/raw-posix: Open file descriptor O_RDWR to work around glibc posix_fallocate emulation issue., Kevin Wolf, 2015/10/08
- [Qemu-devel] [PULL 3/5] iotests: Fix test 128 for password-less sudo,
Kevin Wolf <=
- Re: [Qemu-devel] [PULL 0/5] Block layer patches, Peter Maydell, 2015/10/08