iotests: Minor fixes

[PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd

Posted by Max Reitz 6 years, 1 month ago

There is no $SOCKDIR, only $SOCK_DIR.

Fixes: f3923a72f199b2c63747a7032db74730546f55c6
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index ffb47c3d5c..d088392ab6 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -217,7 +217,8 @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
         TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
     elif [ "$IMGPROTO" = "nbd" ]; then
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
-        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
+        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix"
+        TEST_IMG="$TEST_IMG,file.path=$SOCK_DIR/nbd"
     elif [ "$IMGPROTO" = "ssh" ]; then
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
         TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
-- 
2.23.0

Re: [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd

Posted by Eric Blake 6 years, 1 month ago

On 12/18/19 4:48 AM, Max Reitz wrote:
> There is no $SOCKDIR, only $SOCK_DIR.
> 
> Fixes: f3923a72f199b2c63747a7032db74730546f55c6
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/common.rc | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Whoops.  Thanks for the fix.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Re: [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd

Posted by Philippe Mathieu-Daudé 6 years, 1 month ago

On 12/18/19 11:48 AM, Max Reitz wrote:
> There is no $SOCKDIR, only $SOCK_DIR.
> 
> Fixes: f3923a72f199b2c63747a7032db74730546f55c6
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/common.rc | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index ffb47c3d5c..d088392ab6 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -217,7 +217,8 @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
>           TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
>       elif [ "$IMGPROTO" = "nbd" ]; then
>           TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> -        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
> +        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix"
> +        TEST_IMG="$TEST_IMG,file.path=$SOCK_DIR/nbd"
>       elif [ "$IMGPROTO" = "ssh" ]; then
>           TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
>           TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>