| Message ID | 20191010152457.17713-24-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iotests: Add and use $SOCK_DIR | expand |
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 <mreitz@redhat.com> > --- > 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 <eblake@redhat.com>
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#' }
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 <mreitz@redhat.com> --- tests/qemu-iotests/common.filter | 1 - 1 file changed, 1 deletion(-)