[v1] iotests: Add and use $SOCK_DIR

[PATCH 11/23] iotests/182: Create socket in $SOCK_DIR

Posted by Max Reitz 6 years, 1 month ago

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/182 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index 7f494eb9bb..1ccb850055 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -31,7 +31,7 @@ _cleanup()
 {
     _cleanup_test_img
     rm -f "$TEST_IMG.overlay"
-    rm -f "$TEST_DIR/nbd.socket"
+    rm -f "$SOCK_DIR/nbd.socket"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -133,7 +133,7 @@ success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \
           'addr': {
               'type': 'unix',
               'data': {
-                  'path': '$TEST_DIR/nbd.socket'
+                  'path': '$SOCK_DIR/nbd.socket'
               } } } }" \
     'return' \
     'error'
-- 
2.21.0

Re: [PATCH 11/23] iotests/182: Create socket in $SOCK_DIR

Posted by Eric Blake 6 years, 1 month ago

On 10/10/19 10:24 AM, Max Reitz wrote:
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/182 | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 

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

> diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
> index 7f494eb9bb..1ccb850055 100755
> --- a/tests/qemu-iotests/182
> +++ b/tests/qemu-iotests/182
> @@ -31,7 +31,7 @@ _cleanup()
>   {
>       _cleanup_test_img
>       rm -f "$TEST_IMG.overlay"
> -    rm -f "$TEST_DIR/nbd.socket"
> +    rm -f "$SOCK_DIR/nbd.socket"
>   }
>   trap "_cleanup; exit \$status" 0 1 2 3 15
>   
> @@ -133,7 +133,7 @@ success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \
>             'addr': {
>                 'type': 'unix',
>                 'data': {
> -                  'path': '$TEST_DIR/nbd.socket'
> +                  'path': '$SOCK_DIR/nbd.socket'
>                 } } } }" \
>       'return' \
>       'error'
> 

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

Re: [PATCH 11/23] iotests/182: Create socket in $SOCK_DIR

Posted by Thomas Huth 6 years, 1 month ago

On 10/10/2019 17.24, Max Reitz wrote:
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/182 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>