X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=capitests%2Ftests.c;h=0e42cb40131624e4a6bdfcafa7a9de7a7a385fed;hb=e00b27fea31a67f3bae2f91c70ab1e6816673c4d;hp=016b78d3209d03c576cc6b5b2bc3821a00ee599c;hpb=875dc84cc01dacb1e254e294a66e179b96fbdbc6;p=libguestfs.git

diff --git a/capitests/tests.c b/capitests/tests.c
index 016b78d..0e42cb4 100644
--- a/capitests/tests.c
+++ b/capitests/tests.c
@@ -5794,11 +5794,13 @@ static int test_checksum_8 (void)
   /* TestOutput for checksum (8) */
   char expected[] = "46d6ca27ee07cdc6fa99c2e138cc522c";
   {
+    char options[] = "ro";
+    char vfstype[] = "squashfs";
     char device[] = "/dev/sdd";
     char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, device, mountpoint);
+    r = guestfs_mount_vfs (g, options, vfstype, device, mountpoint);
     if (r == -1)
       return -1;
   }
@@ -15751,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++;