From: Richard Jones <rjones@redhat.com>
Date: Sat, 27 Mar 2010 10:49:24 +0000 (+0000)
Subject: tests: Move alarm(2) calls to the correct place in the tests.
X-Git-Tag: 1.0.89~11
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;ds=inline;h=ef3a6692412b234a46326d330943556977f7c988;hp=650159fce9b5d6424c233e42aa36c94e13dc2a1b;p=libguestfs.git

tests: Move alarm(2) calls to the correct place in the tests.

This is a re-fix for RHBZ#505329.
---

diff --git a/src/generator.ml b/src/generator.ml
index e996521..f519c4d 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -6450,14 +6450,14 @@ int main (int argc, char *argv[])
     exit (EXIT_FAILURE);
   }
 
+  /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */
+  alarm (600);
+
   if (guestfs_launch (g) == -1) {
     printf (\"guestfs_launch FAILED\\n\");
     exit (EXIT_FAILURE);
   }
 
-  /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */
-  alarm (600);
-
   /* Cancel previous alarm. */
   alarm (0);