On 10/10/19 10:24 AM, Max Reitz wrote:
Signed-off-by: Max Reitz <[email protected]>
---
tests/qemu-iotests/common.filter | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
@@ -218,7 +221,8 @@ _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=$TEST_DIR#?socket=TEST_DIR#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#'
This goes away in 23, but this looks crazy. Don't you really want the
first line to replace $TEST_DIR with TEST_DIR (not $SOCK_DIR with
TEST_DIR)? Otherwise, bisection is likely to break until all the
intermediate patches have made the conversion to stop using TEST_DIR.
I already gave R-b, but you'll need to fix this one.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
