[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 04/23] iotests: Filter $SOCK_DIR
From: |
Max Reitz |
Subject: |
Re: [PATCH 04/23] iotests: Filter $SOCK_DIR |
Date: |
Fri, 11 Oct 2019 09:57:08 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 |
On 10.10.19 21:50, Eric Blake wrote:
> On 10/10/19 10:24 AM, Max Reitz wrote:
>> Signed-off-by: Max Reitz <address@hidden>
>> ---
>> 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.
Oops, yes. I messed it up. I only intended to add the SOCK_DIR
replacement line.
(Originally I had 23 merged into this one, and then I noticed it would
break bisection, so I tried to pull it out. And failed, as you can see.)
Max
signature.asc
Description: OpenPGP digital signature