From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Denis V. Lunev" <den@openvz.org>, Kevin Wolf <kwolf@redhat.com>,
Hanna Reitz <hreitz@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
qemu-block@nongnu.org (open list:Block layer core)
Subject: [PULL 1/7] iotests: use TEST_IMG_FILE instead of TEST_IMG in _require_large_file
Date: Mon, 25 Sep 2023 14:01:16 -0500 [thread overview]
Message-ID: <20230925190114.3163545-10-eblake@redhat.com> (raw)
In-Reply-To: <20230925190114.3163545-9-eblake@redhat.com>
From: "Denis V. Lunev" <den@openvz.org>
We need to check that we are able to create large enough file which is
used as an export base rather than connection URL. Unfortunately, there
are cases when the TEST_IMG_FILE is not defined. We should fallback to
TEST_IMG in that case.
This problem has been detected when running
./check -nbd 5
The test should be able to run while it does not.
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Hanna Reitz <hreitz@redhat.com>
CC: Eric Blake <eblake@redhat.com>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20230906140917.559129-2-den@openvz.org>
Tested-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
tests/qemu-iotests/common.rc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index d145f08201c..95c12577dd4 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -979,10 +979,15 @@ _require_drivers()
#
_require_large_file()
{
- if ! truncate --size="$1" "$TEST_IMG"; then
+ if [ -z "$TEST_IMG_FILE" ]; then
+ FILENAME="$TEST_IMG"
+ else
+ FILENAME="$TEST_IMG_FILE"
+ fi
+ if ! truncate --size="$1" "$FILENAME"; then
_notrun "file system on $TEST_DIR does not support large enough files"
fi
- rm "$TEST_IMG"
+ rm "$FILENAME"
}
# Check that a set of devices is available in the QEMU binary
--
2.41.0
next prev parent reply other threads:[~2023-09-25 19:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 19:01 [PULL 0/7] NBD patches through 2023-09-25 Eric Blake
2023-09-25 19:01 ` Eric Blake [this message]
2023-09-25 19:01 ` [PULL 2/7] iotests: improve 'not run' message for nbd-multiconn test Eric Blake
2023-09-25 19:01 ` [PULL 3/7] nbd: Replace bool structured_reply with mode enum Eric Blake
2023-09-25 19:01 ` [PULL 4/7] nbd/client: Pass mode through to nbd_send_request Eric Blake
2023-09-25 19:01 ` [PULL 5/7] nbd: Add types for extended headers Eric Blake
2023-09-25 19:01 ` [PULL 6/7] nbd: Prepare for 64-bit request effect lengths Eric Blake
2023-09-25 19:01 ` [PULL 7/7] nbd/server: Refactor handling of command sanity checks Eric Blake
2023-09-26 16:15 ` [PULL 0/7] NBD patches through 2023-09-25 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=20230925190114.3163545-10-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=den@openvz.org \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@yandex-team.ru \
/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).