git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Catching hanging qemu in tests (RHBZ#505329).
[libguestfs.git]
/
capitests
/
tests.c
diff --git
a/capitests/tests.c
b/capitests/tests.c
index
536da7f
..
0e42cb4
100644
(file)
--- a/
capitests/tests.c
+++ b/
capitests/tests.c
@@
-15753,11
+15753,18
@@
int main (int argc, char *argv[])
printf ("guestfs_launch FAILED\n");
exit (1);
}
printf ("guestfs_launch FAILED\n");
exit (1);
}
+
+ /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */
+ alarm (600);
+
if (guestfs_wait_ready (g) == -1) {
printf ("guestfs_wait_ready FAILED\n");
exit (1);
}
if (guestfs_wait_ready (g) == -1) {
printf ("guestfs_wait_ready FAILED\n");
exit (1);
}
+ /* Cancel previous alarm. */
+ alarm (0);
+
nr_tests = 146;
test_num++;
nr_tests = 146;
test_num++;