| Message ID | 1447108773-6836-9-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 11/09 23:39, Max Reitz wrote: > This function should support URLs of the "nbd://" format (without > swallowing the export name), and for "nbd:///" URLs it should replace > "?socket=$TEST_DIR" by "?socket=TEST_DIR" because putting the Unix > socket files into the test directory makes sense. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/common.filter | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter > index 0fc443a..bd53cab 100644 > --- a/tests/qemu-iotests/common.filter > +++ b/tests/qemu-iotests/common.filter > @@ -238,7 +238,8 @@ _filter_nbd() > # > # Filter out the TCP port number since this changes between runs. > sed -e '/nbd\.c:/d' \ > - -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \ > + -e 's#nbd:\(//\)\?127\.0\.0\.1:[0-9]*#nbd:\1127.0.0.1:PORT#g' \ > + -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \ > -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' > } > > -- > 2.6.2 > > Reviewed-by: Fam Zheng <famz@redhat.com>
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 0fc443a..bd53cab 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -238,7 +238,8 @@ _filter_nbd() # # Filter out the TCP port number since this changes between runs. sed -e '/nbd\.c:/d' \ - -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \ + -e 's#nbd:\(//\)\?127\.0\.0\.1:[0-9]*#nbd:\1127.0.0.1:PORT#g' \ + -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \ -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' }
This function should support URLs of the "nbd://" format (without swallowing the export name), and for "nbd:///" URLs it should replace "?socket=$TEST_DIR" by "?socket=TEST_DIR" because putting the Unix socket files into the test directory makes sense. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/common.filter | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)