Re: [PATCH 07/23] iotests/140: Create socket in $SOCK_DIR

[Thomas Huth]

On 10/10/2019 17.24, Max Reitz wrote:
> Signed-off-by: Max Reitz 
> ---
>  tests/qemu-iotests/140 | 8 
>  tests/qemu-iotests/140.out | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Thomas Huth 

Re: [PATCH 07/23] iotests/140: Create socket in $SOCK_DIR

[Eric Blake]

On 10/10/19 10:24 AM, Max Reitz wrote:

Signed-off-by: Max Reitz 
---
  tests/qemu-iotests/140 | 8 
  tests/qemu-iotests/140.out | 2 +-
  2 files changed, 5 insertions(+), 5 deletions(-)



Reviewed-by: Eric Blake 

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

[PATCH 07/23] iotests/140: Create socket in $SOCK_DIR

[Max Reitz]

Signed-off-by: Max Reitz 
---
 tests/qemu-iotests/140 | 8 
 tests/qemu-iotests/140.out | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index b965b1dd5d..8d2ce5d9e3 100755
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140
@@ -34,7 +34,7 @@ _cleanup()
 {
 _cleanup_qemu
 _cleanup_test_img
-rm -f "$TEST_DIR/nbd"
+rm -f "$SOCK_DIR/nbd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -69,7 +69,7 @@ _send_qemu_cmd $QEMU_HANDLE \
 _send_qemu_cmd $QEMU_HANDLE \
 "{ 'execute': 'nbd-server-start',
'arguments': { 'addr': { 'type': 'unix',
-'data': { 'path': '$TEST_DIR/nbd' " \
+'data': { 'path': '$SOCK_DIR/nbd' " \
 'return'
 
 _send_qemu_cmd $QEMU_HANDLE \
@@ -78,7 +78,7 @@ _send_qemu_cmd $QEMU_HANDLE \
 'return'
 
 $QEMU_IO_PROG -f raw -r -c 'read -P 42 0 64k' \
-"nbd+unix:///drv?socket=$TEST_DIR/nbd" 2>&1 \
+"nbd+unix:///drv?socket=$SOCK_DIR/nbd" 2>&1 \
 | _filter_qemu_io | _filter_nbd
 
 _send_qemu_cmd $QEMU_HANDLE \
@@ -87,7 +87,7 @@ _send_qemu_cmd $QEMU_HANDLE \
 'return'
 
 $QEMU_IO_PROG -f raw -r -c close \
-"nbd+unix:///drv?socket=$TEST_DIR/nbd" 2>&1 \
+"nbd+unix:///drv?socket=$SOCK_DIR/nbd" 2>&1 \
 | _filter_qemu_io | _filter_nbd
 
 _send_qemu_cmd $QEMU_HANDLE \
diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
index 67fe44a3e3..2511eb7369 100644
--- a/tests/qemu-iotests/140.out
+++ b/tests/qemu-iotests/140.out
@@ -8,7 +8,7 @@ wrote 65536/65536 bytes at offset 0
 read 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 {"return": {}}
-qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested 
export not available
+qemu-io: can't open device nbd+unix:///drv?socket=SOCK_DIR/nbd: Requested 
export not available
 server reported: export 'drv' not present
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": 
"SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
-- 
2.21.0