From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
Wainer dos Santos Moschetta <wainersm@redhat.com>,
Eric Auger <eric.auger@redhat.com>,
Christian Ehrhardt <christian.ehrhardt@canonical.com>,
Cleber Rosa <crosa@redhat.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: Re: [PATCH v2 1/7] iotests: Provide a function for checking the creation of huge files
Date: Wed, 4 Dec 2019 16:53:00 +0100 [thread overview]
Message-ID: <c517b736-4a30-a69d-34c2-a94212676ad9@redhat.com> (raw)
In-Reply-To: <20191204154618.23560-2-thuth@redhat.com>
On 12/4/19 4:46 PM, Thomas Huth wrote:
> Some tests create huge (but sparse) files, and to be able to run those
> tests in certain limited environments (like CI containers), we have to
> check for the possibility to create such files first. Thus let's introduce
> a common function to check for large files, and replace the already
> existing checks in the iotests 005 and 220 with this function.
>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/qemu-iotests/005 | 5 +----
> tests/qemu-iotests/220 | 6 ++----
> tests/qemu-iotests/common.rc | 10 ++++++++++
> 3 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
> index 58442762fe..b6d03ac37d 100755
> --- a/tests/qemu-iotests/005
> +++ b/tests/qemu-iotests/005
> @@ -59,10 +59,7 @@ fi
> # Sanity check: For raw, we require a file system that permits the creation
> # of a HUGE (but very sparse) file. Check we can create it before continuing.
> if [ "$IMGFMT" = "raw" ]; then
> - if ! truncate --size=5T "$TEST_IMG"; then
> - _notrun "file system on $TEST_DIR does not support large enough files"
> - fi
> - rm "$TEST_IMG"
> + _require_large_file 5T
> fi
>
> echo
> diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
> index 2d62c5dcac..15159270d3 100755
> --- a/tests/qemu-iotests/220
> +++ b/tests/qemu-iotests/220
> @@ -42,10 +42,8 @@ echo "== Creating huge file =="
>
> # Sanity check: We require a file system that permits the creation
> # of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
> -if ! truncate --size=513T "$TEST_IMG"; then
> - _notrun "file system on $TEST_DIR does not support large enough files"
> -fi
> -rm "$TEST_IMG"
> +_require_large_file 513T
> +
> IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
>
> echo "== Populating refcounts =="
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index 0cc8acc9ed..6f0582c79a 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -643,5 +643,15 @@ _require_drivers()
> done
> }
>
> +# Check that we have a file system that allows huge (but very sparse) files
> +#
> +_require_large_file()
> +{
> + if ! truncate --size="$1" "$TEST_IMG"; then
> + _notrun "file system on $TEST_DIR does not support large enough files"
> + fi
> + rm "$TEST_IMG"
> +}
:)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> +
> # make sure this script returns success
> true
>
next prev parent reply other threads:[~2019-12-04 16:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 15:46 [PATCH v2 0/7] Enable Travis builds on arm64, ppc64le and s390x Thomas Huth
2019-12-04 15:46 ` [PATCH v2 1/7] iotests: Provide a function for checking the creation of huge files Thomas Huth
2019-12-04 15:53 ` Philippe Mathieu-Daudé [this message]
2019-12-05 1:06 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 2/7] iotests: Skip test 060 if it is not possible to create large files Thomas Huth
2019-12-04 15:53 ` Philippe Mathieu-Daudé
2019-12-05 18:41 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 3/7] iotests: Skip test 079 " Thomas Huth
2019-12-04 15:53 ` Philippe Mathieu-Daudé
2019-12-06 5:59 ` Thomas Huth
2019-12-04 15:46 ` [PATCH v2 4/7] tests/hd-geo-test: Skip test when images can not be created Thomas Huth
2019-12-05 20:25 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 5/7] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Thomas Huth
2019-12-05 20:37 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 6/7] configure: allow disable of cross compilation containers Thomas Huth
2019-12-05 20:39 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 7/7] travis.yml: Enable builds on arm64, ppc64le and s390x Thomas Huth
2019-12-04 22:09 ` David Gibson
2019-12-04 20:03 ` [PATCH v2 0/7] Enable Travis " Cleber Rosa
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=c517b736-4a30-a69d-34c2-a94212676ad9@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=christian.ehrhardt@canonical.com \
--cc=crosa@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=eric.auger@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@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).