Catching hanging qemu in tests (RHBZ#505329).

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);
   }
+
+  /* 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);
   }
 
+  /* Cancel previous alarm. */
+  alarm (0);
+
   nr_tests = 146;
 
   test_num++;

diff --git a/src/generator.ml b/src/generator.ml
index b3f27cd..0a0f9b1 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -3980,11 +3980,18 @@ int main (int argc, char *argv[])
     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);
   }
 
+  /* Cancel previous alarm. */
+  alarm (0);
+
   nr_tests = %d;
 
 " (500 * 1024 * 1024) (50 * 1024 * 1024) (10 * 1024 * 1024) nr_tests;