Re: [PATCH 23/23] iotests: Drop TEST_DIR filter from _filter_nbd

2019-10-10 Thread Eric Blake 

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

Sockets should be placed into $SOCK_DIR instead of $TEST_DIR, so remove
the $TEST_DIR filter from _filter_nbd.

Signed-off-by: Max Reitz 
---
  tests/qemu-iotests/common.filter | 1 -
  1 file changed, 1 deletion(-)

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index cd42f5e7e3..f870e00e44 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -221,7 +221,6 @@ _filter_nbd()
  # Filter out the TCP port number since this changes between runs.
  $SED -e '/nbd\/.*\.c:/d' \
  -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \
--e "s#?socket=$SOCK_DIR#?socket=TEST_DIR#g" \
  -e "s#?socket=$SOCK_DIR#?socket=SOCK_DIR#g" \


Whoops - you have a bug in patch 4.  Once that is fixed, then deleting 
the line:


-e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \

here is appropriate.  So with that amendment to the series,

Reviewed-by: Eric Blake 

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

[PATCH 23/23] iotests: Drop TEST_DIR filter from _filter_nbd

2019-10-10 Thread Max Reitz 
Sockets should be placed into $SOCK_DIR instead of $TEST_DIR, so remove
the $TEST_DIR filter from _filter_nbd.

Signed-off-by: Max Reitz 
---
 tests/qemu-iotests/common.filter | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index cd42f5e7e3..f870e00e44 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -221,7 +221,6 @@ _filter_nbd()
 # Filter out the TCP port number since this changes between runs.
 $SED -e '/nbd\/.*\.c:/d' \
 -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \
--e "s#?socket=$SOCK_DIR#?socket=TEST_DIR#g" \
 -e "s#?socket=$SOCK_DIR#?socket=SOCK_DIR#g" \
 -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#'
 }
-- 
2.21.0