mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/hd-geo-test: Skip test when images can not be created

Browse Source 
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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20191204154618.23560-5-thuth@redhat.com>
This commit is contained in:
Thomas Huth 2019-12-04 16:46:15 +01:00 committed by Alex Bennée
parent 178d383f10
commit a0d6d7454a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/hd-geo-test.c
View File

@ -34,8 +34,13 @@ static char *create_test_img(int secs)
fd = mkstemp(template); fd = mkstemp(template);
g_assert(fd >= 0); g_assert(fd >= 0);
ret = ftruncate(fd, (off_t)secs * 512); ret = ftruncate(fd, (off_t)secs * 512);
g_assert(ret == 0);
close(fd); close(fd);
if (ret) {
free(template);
template = NULL;
}
return template; return template;
} }
@ -934,6 +939,10 @@ int main(int argc, char **argv)
for (i = 0; i < backend_last; i++) { for (i = 0; i < backend_last; i++) {
if (img_secs[i] >= 0) { if (img_secs[i] >= 0) {
img_file_name[i] = create_test_img(img_secs[i]); 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 { } else {
img_file_name[i] = NULL; img_file_name[i] = NULL;
} }
@ -965,6 +974,7 @@ int main(int argc, char **argv)
"skipping hd-geo/override/* tests"); "skipping hd-geo/override/* tests");
} }
test_add_done:
ret = g_test_run(); ret = g_test_run();
for (i = 0; i < backend_last; i++) { for (i = 0; i < backend_last; i++) {