From: Max Reitz <mreitz@redhat.com>
To: Eric Blake <eblake@redhat.com>, qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH 04/23] iotests: Filter $SOCK_DIR
Date: Fri, 11 Oct 2019 09:57:08 +0200 [thread overview]
Message-ID: <333ea7f7-ee1c-16d3-0f1e-9828686e97a5@redhat.com> (raw)
In-Reply-To: <727638b4-8588-76eb-1428-9b2a9a8df380@redhat.com>
[-- Attachment #1.1: Type: text/plain, Size: 1352 bytes --]
On 10.10.19 21:50, Eric Blake wrote:
> On 10/10/19 10:24 AM, Max Reitz wrote:
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-10-11 7:59 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 15:24 [PATCH 00/23] iotests: Add and use $SOCK_DIR Max Reitz
2019-10-10 15:24 ` [PATCH 01/23] iotests: Introduce $SOCK_DIR Max Reitz
2019-10-10 18:18 ` Eric Blake
2019-10-11 7:51 ` Max Reitz
2019-10-10 15:24 ` [PATCH 02/23] iotests.py: Store socket files in $SOCK_DIR Max Reitz
2019-10-10 18:36 ` Eric Blake
2019-10-11 7:21 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 03/23] iotests.py: Add @base_dir to FilePaths etc Max Reitz
2019-10-10 18:40 ` Eric Blake
2019-10-10 15:24 ` [PATCH 04/23] iotests: Filter $SOCK_DIR Max Reitz
2019-10-10 18:42 ` Eric Blake
2019-10-11 7:54 ` Max Reitz
2019-10-11 7:57 ` Thomas Huth
2019-10-10 19:50 ` Eric Blake
2019-10-11 7:57 ` Max Reitz [this message]
2019-10-10 15:24 ` [PATCH 05/23] iotests: Let common.nbd create socket in $SOCK_DIR Max Reitz
2019-10-10 18:59 ` Eric Blake
2019-10-10 15:24 ` [PATCH 06/23] iotests/083: Create " Max Reitz
2019-10-10 19:03 ` Eric Blake
2019-10-11 7:31 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 07/23] iotests/140: " Max Reitz
2019-10-10 19:05 ` Eric Blake
2019-10-11 7:34 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 08/23] iotests/143: " Max Reitz
2019-10-10 19:23 ` Eric Blake
2019-10-11 7:35 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 09/23] iotests/147: " Max Reitz
2019-10-10 19:23 ` Eric Blake
2019-10-11 7:36 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 10/23] iotests/181: " Max Reitz
2019-10-10 19:24 ` Eric Blake
2019-10-11 7:38 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 11/23] iotests/182: " Max Reitz
2019-10-10 19:24 ` Eric Blake
2019-10-11 7:38 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 12/23] iotests/183: " Max Reitz
2019-10-10 19:28 ` Eric Blake
2019-10-11 7:42 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 13/23] iotests/192: " Max Reitz
2019-10-10 19:28 ` Eric Blake
2019-10-10 15:24 ` [PATCH 14/23] iotests/194: Create sockets " Max Reitz
2019-10-10 19:32 ` Eric Blake
2019-10-10 19:43 ` Eric Blake
2019-10-11 7:55 ` Max Reitz
2019-10-10 15:24 ` [PATCH 15/23] iotests/201: Create socket " Max Reitz
2019-10-10 19:39 ` Eric Blake
2019-10-10 15:24 ` [PATCH 16/23] iotests/205: " Max Reitz
2019-10-10 19:40 ` Eric Blake
2019-10-10 15:24 ` [PATCH 17/23] iotests/208: " Max Reitz
2019-10-10 19:41 ` Eric Blake
2019-10-10 15:24 ` [PATCH 18/23] iotests/209: " Max Reitz
2019-10-10 19:44 ` Eric Blake
2019-10-10 15:24 ` [PATCH 19/23] iotests/222: " Max Reitz
2019-10-10 19:45 ` Eric Blake
2019-10-10 15:24 ` [PATCH 20/23] iotests/223: " Max Reitz
2019-10-10 19:46 ` Eric Blake
2019-10-10 15:24 ` [PATCH 21/23] iotests/240: " Max Reitz
2019-10-10 19:46 ` Eric Blake
2019-10-10 15:24 ` [PATCH 22/23] iotests/267: " Max Reitz
2019-10-10 19:47 ` Eric Blake
2019-10-10 15:24 ` [PATCH 23/23] iotests: Drop TEST_DIR filter from _filter_nbd Max Reitz
2019-10-10 19:51 ` Eric Blake
2019-10-11 7:27 ` [PATCH 00/23] iotests: Add and use $SOCK_DIR Thomas Huth
2019-10-11 8:03 ` Max Reitz
2019-10-11 8:13 ` Thomas Huth
2019-10-11 8:54 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=333ea7f7-ee1c-16d3-0f1e-9828686e97a5@redhat.com \
--to=mreitz@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).