From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Kevin Wolf" <kwolf@redhat.com>, "Max Reitz" <mreitz@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-block@nongnu.org
Subject: [PATCH 3/6] tests/hd-geo-test: Skip test when images can not be created
Date: Tue, 19 Nov 2019 18:08:18 +0100 [thread overview]
Message-ID: <20191119170822.45649-4-thuth@redhat.com> (raw)
In-Reply-To: <20191119170822.45649-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.
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.23.0
next prev parent reply other threads:[~2019-11-19 17:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 17:08 [PATCH 0/6] Enable Travis builds on arm64, ppc64le and s390x Thomas Huth
2019-11-19 17:08 ` [PATCH 1/6] iotests: Skip test 060 if it is not possible to create large files Thomas Huth
2019-11-22 12:53 ` Alex Bennée
2019-11-19 17:08 ` [PATCH 2/6] iotests: Skip test 079 " Thomas Huth
2019-11-19 17:29 ` Philippe Mathieu-Daudé
2019-11-19 17:34 ` Thomas Huth
2019-11-19 17:38 ` Philippe Mathieu-Daudé
2019-11-19 17:50 ` Daniel P. Berrangé
2019-11-19 18:32 ` Thomas Huth
2019-11-22 12:57 ` Alex Bennée
2019-11-19 17:08 ` Thomas Huth [this message]
2019-11-19 17:28 ` [PATCH 3/6] tests/hd-geo-test: Skip test when images can not be created Philippe Mathieu-Daudé
2019-11-22 16:28 ` Alex Bennée
2019-11-19 17:08 ` [PATCH 4/6] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Thomas Huth
2019-11-19 17:31 ` Philippe Mathieu-Daudé
2019-11-22 16:29 ` Alex Bennée
2019-11-19 17:08 ` [PATCH 5/6] travis.yml: drop 32 bit systems from MAIN_SOFTMMU_TARGETS Thomas Huth
2019-11-19 17:31 ` Philippe Mathieu-Daudé
2019-11-19 17:08 ` [PATCH 6/6] travis.yml: Enable builds on arm64, ppc64le and s390x Thomas Huth
2019-11-22 18:11 ` Alex Bennée
2019-11-22 23:09 ` [PATCH 0/6] Enable Travis " Alex Bennée
2019-11-25 10:28 ` Alex Bennée
2019-11-27 8:50 ` Thomas Huth
2019-12-04 14:03 ` Thomas Huth
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=20191119170822.45649-4-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@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).