X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=capitests%2Ftests.c;h=e5466b5ebca893c9af7fca43b4125141862c54d6;hp=536da7f2f371ca3de95f38e8c476787f10001ffa;hb=4211c7a258debd236017a19c70965bc1b3658edb;hpb=ccc1d216032ff61a81eb1116df44d5bd82079462

diff --git a/capitests/tests.c b/capitests/tests.c
index 536da7f..e5466b5 100644
--- a/capitests/tests.c
+++ b/capitests/tests.c
@@ -148,6 +148,8 @@ static void no_test_warnings (void)
   fprintf (stderr, "warning: \"guestfs_vg_activate\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_resize2fs\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_e2fsck_f\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sh\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sh_lines\" has no tests\n");
 }
 
 static int test_ntfs_3g_probe_0_skip (void)
@@ -15753,11 +15755,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++;