[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 12/50] iotests: Make _filter_nbd support more URL
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL v2 12/50] iotests: Make _filter_nbd support more URL types |
Date: |
Tue, 2 Feb 2016 18:35:05 +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>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <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 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#'
}
--
2.7.0
- [Qemu-devel] [PULL v2 01/50] block: Add blk_dev_has_tray(), (continued)
- [Qemu-devel] [PULL v2 01/50] block: Add blk_dev_has_tray(), Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 04/50] block/qapi: Emit tray_open only if there is a tray, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 07/50] nbd: client_close on error in nbd_co_client_start, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 06/50] iotests: Limit supported formats for 118, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 03/50] Revert "hw/block/fdc: Implement tray status", Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 05/50] vmdk: Fix converting to streamOptimized, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 09/50] iotests: Change coding style of _filter_nbd in 083, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd in 083, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 10/50] iotests: Move _filter_nbd into common.filter, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 11/50] iotests: Make _filter_nbd drop log lines, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 12/50] iotests: Make _filter_nbd support more URL types,
Max Reitz <=
- [Qemu-devel] [PULL v2 13/50] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 14/50] iotests: Add test for a nonexistent NBD export, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 16/50] block: Release named dirty bitmaps in bdrv_close(), Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 15/50] block: Remove unused struct definition BlockFinishData, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 18/50] block: Add BB-BDS remove/insert notifiers, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 17/50] iotests: Add test for eject under NBD server, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 21/50] nbd: Switch from close to eject notifier, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 19/50] virtio-blk: Functions for op blocker management, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 20/50] virtio-scsi: Catch BDS-BB removal/insertion, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 24/50] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2016/02/02