[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 08/24] iotests: Make _filter_nbd support more URL
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v7 08/24] iotests: Make _filter_nbd support more URL types |
Date: |
Mon, 9 Nov 2015 23:39:17 +0100 |
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 <address@hidden>
---
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
[Qemu-devel] [PATCH v7 05/24] iotests: Change coding style of _filter_nbd in 083, Max Reitz, 2015/11/09
[Qemu-devel] [PATCH v7 06/24] iotests: Move _filter_nbd into common.filter, Max Reitz, 2015/11/09
[Qemu-devel] [PATCH v7 07/24] iotests: Make _filter_nbd drop log lines, Max Reitz, 2015/11/09
[Qemu-devel] [PATCH v7 08/24] iotests: Make _filter_nbd support more URL types,
Max Reitz <=
[Qemu-devel] [PATCH v7 09/24] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2015/11/09
[Qemu-devel] [PATCH v7 10/24] iotests: Add test for eject under NBD server, Max Reitz, 2015/11/09
[Qemu-devel] [PATCH v7 11/24] block: Add BB-BDS remove/insert notifiers, Max Reitz, 2015/11/09
[Qemu-devel] [PATCH v7 12/24] virtio-blk: Functions for op blocker management, Max Reitz, 2015/11/09