Message ID | 20191010152457.17713-12-mreitz@redhat.com |
---|---|
State | New |
Headers | show |
Series | iotests: Add and use $SOCK_DIR | expand |
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' >
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>
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'
Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/182 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)