git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unreadable binaries that give warnings in supermin appliance.
[libguestfs.git]
/
capitests
/
tests.c
diff --git
a/capitests/tests.c
b/capitests/tests.c
index
016b78d
..
0e42cb4
100644
(file)
--- 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";
{
/* TestOutput for checksum (8) */
char expected[] = "46d6ca27ee07cdc6fa99c2e138cc522c";
{
+ char options[] = "ro";
+ char vfstype[] = "squashfs";
char device[] = "/dev/sdd";
char mountpoint[] = "/";
int r;
suppress_error = 0;
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;
}
if (r == -1)
return -1;
}
@@
-15751,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++;