git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: Debian and Ubuntu are now separate distros.
[libguestfs.git]
/
test-tool
/
test-tool.c
diff --git
a/test-tool/test-tool.c
b/test-tool/test-tool.c
index
223cafc
..
c21906f
100644
(file)
--- a/
test-tool/test-tool.c
+++ b/
test-tool/test-tool.c
@@
-60,12
+60,16
@@
#define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0)
#define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0)
#define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0)
#define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0)
+#ifndef P_tmpdir
+#define P_tmpdir "/tmp"
+#endif
+
#define DEFAULT_TIMEOUT 120
static const char *helper = DEFAULT_HELPER;
static int timeout = DEFAULT_TIMEOUT;
#define DEFAULT_TIMEOUT 120
static const char *helper = DEFAULT_HELPER;
static int timeout = DEFAULT_TIMEOUT;
-static char tmpf[] =
"/tmp
/libguestfs-test-tool-sda-XXXXXX";
-static char isof[] =
"/tmp
/libguestfs-test-tool-iso-XXXXXX";
+static char tmpf[] =
P_tmpdir "
/libguestfs-test-tool-sda-XXXXXX";
+static char isof[] =
P_tmpdir "
/libguestfs-test-tool-iso-XXXXXX";
static guestfs_h *g;
static void preruncheck (void);
static guestfs_h *g;
static void preruncheck (void);
@@
-178,13
+182,18
@@
main (int argc, char *argv[])
_("libguestfs-test-tool: failed to create libguestfs handle\n"));
exit (EXIT_FAILURE);
}
_("libguestfs-test-tool: failed to create libguestfs handle\n"));
exit (EXIT_FAILURE);
}
- if (guestfs_add_drive (g, tmpf) == -1) {
+ if (guestfs_add_drive_opts (g, tmpf,
+ GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+ -1) == -1) {
fprintf (stderr,
_("libguestfs-test-tool: failed to add drive '%s'\n"),
tmpf);
exit (EXIT_FAILURE);
}
fprintf (stderr,
_("libguestfs-test-tool: failed to add drive '%s'\n"),
tmpf);
exit (EXIT_FAILURE);
}
- if (guestfs_add_drive (g, isof) == -1) {
+ if (guestfs_add_drive_opts (g, isof,
+ GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+ GUESTFS_ADD_DRIVE_OPTS_READONLY, 1,
+ -1) == -1) {
fprintf (stderr,
_("libguestfs-test-tool: failed to add drive '%s'\n"),
isof);
fprintf (stderr,
_("libguestfs-test-tool: failed to add drive '%s'\n"),
isof);
@@
-269,7
+278,7
@@
main (int argc, char *argv[])
exit (EXIT_SUCCESS);
}
exit (EXIT_SUCCESS);
}
-static char qemuwrapper[] =
"/tmp
/libguestfs-test-tool-wrapper-XXXXXX";
+static char qemuwrapper[] =
P_tmpdir "
/libguestfs-test-tool-wrapper-XXXXXX";
static void
cleanup_wrapper (void)
static void
cleanup_wrapper (void)