diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-01-25 19:41:13 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-02-02 17:49:42 +0100 |
| commit | 4a940d14b3000bee4826f6938e6e0dd67393cf35 (patch) | |
| tree | 00550c32cfa63b10fecf5a6523fa75c0c1176b1b | |
| parent | dd170c06777d11ecee2d4f4977398068b9b38f03 (diff) | |
| download | qemu-4a940d14b3000bee4826f6938e6e0dd67393cf35.zip qemu-4a940d14b3000bee4826f6938e6e0dd67393cf35.tar.gz qemu-4a940d14b3000bee4826f6938e6e0dd67393cf35.tar.bz2 | |
iotests: Make _filter_nbd support more URL types
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>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | tests/qemu-iotests/common.filter | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index e1bfdb7..84b7434 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#' } |