From: Thomas Huth <thuth@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
"Christian Ehrhardt" <christian.ehrhardt@canonical.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH v2 4/7] tests/hd-geo-test: Skip test when images can not be created
Date: Wed, 4 Dec 2019 16:46:15 +0100 [thread overview]
Message-ID: <20191204154618.23560-5-thuth@redhat.com> (raw)
In-Reply-To: <20191204154618.23560-1-thuth@redhat.com>
In certain environments like restricted containers, we can not create
huge test images. To be able to use "make check" in such container
environments, too, let's skip the hd-geo-test instead of failing when
the test images could not be created.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/hd-geo-test.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index 7e86c5416c..a249800544 100644
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -34,8 +34,13 @@ static char *create_test_img(int secs)
fd = mkstemp(template);
g_assert(fd >= 0);
ret = ftruncate(fd, (off_t)secs * 512);
- g_assert(ret == 0);
close(fd);
+
+ if (ret) {
+ free(template);
+ template = NULL;
+ }
+
return template;
}
@@ -934,6 +939,10 @@ int main(int argc, char **argv)
for (i = 0; i < backend_last; i++) {
if (img_secs[i] >= 0) {
img_file_name[i] = create_test_img(img_secs[i]);
+ if (!img_file_name[i]) {
+ g_test_message("Could not create test images.");
+ goto test_add_done;
+ }
} else {
img_file_name[i] = NULL;
}
@@ -965,6 +974,7 @@ int main(int argc, char **argv)
"skipping hd-geo/override/* tests");
}
+test_add_done:
ret = g_test_run();
for (i = 0; i < backend_last; i++) {
--
2.18.1
next prev parent reply other threads:[~2019-12-04 15:50 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é
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 ` Thomas Huth [this message]
2019-12-05 20:25 ` [PATCH v2 4/7] tests/hd-geo-test: Skip test when images can not be created 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=20191204154618.23560-5-thuth@redhat.com \
--to=thuth@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=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--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).