From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
Hanna Reitz <hreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>
Subject: [PATCH 3/7] iotests: string substitution order in _filter_img_create_filenames
Date: Tue, 25 Jul 2023 10:19:11 -0400 [thread overview]
Message-ID: <20230725141915.386364-4-stefanha@redhat.com> (raw)
In-Reply-To: <20230725141915.386364-1-stefanha@redhat.com>
_filter_img_create_filenames fails to remove $IMGPROTO: when
$REMOTE_TEST_DIR matches. echo "$IMGPROTO:$REMOTE_TEST_DIR" |
_filter_img_create_filenames results in "$IMGPROTO:TEST_DIR" instead of
"TEST_DIR".
Substitute "s#$REMOTE_TEST_DIR#TEST_DIR#g" after
"s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" since the latter matches $TEST_DIR.
This way echo "$IMGPROTO:$REMOTE_TEST_DIR" |
_filter_img_create_filenames results in "TEST_DIR" as expected.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qemu-iotests/common.filter | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index fc3c64bcb8..4acac16c52 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -125,8 +125,8 @@ _filter_actual_image_size()
_filter_img_create_filenames()
{
sed \
+ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
-e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
- -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
-e "s#$TEST_DIR#TEST_DIR#g" \
-e "s#$SOCK_DIR#SOCK_DIR#g" \
-e 's#SOCK_DIR/fuse-#TEST_DIR/#g' \
--
2.41.0
next prev parent reply other threads:[~2023-07-25 14:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 14:19 [PATCH 0/7] iotests: add -io_uring support Stefan Hajnoczi
2023-07-25 14:19 ` [PATCH 1/7] block/blkio: add io_uring: filename parsing Stefan Hajnoczi
2023-07-25 14:19 ` [PATCH 2/7] block/blkio: add "simple" creation support Stefan Hajnoczi
2023-07-25 14:19 ` Stefan Hajnoczi [this message]
2023-07-25 14:19 ` [PATCH 4/7] iotests: filter img create backing_file when IMGPROTO is modified Stefan Hajnoczi
2023-07-25 14:19 ` [PATCH 5/7] iotests: add -io_uring support Stefan Hajnoczi
2023-07-25 14:19 ` [PATCH 6/7] iotests: add io_uring to supported protocols in 012 Stefan Hajnoczi
2023-07-25 14:19 ` [PATCH 7/7] iotests: add io_uring to supported protocols in 052 Stefan Hajnoczi
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=20230725141915.386364-4-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).