X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=test-tool%2Ftest-tool.c;h=55e503f15281751550d03918da45a9be89d087ab;hp=3dc03289ff14bb07d244786513b82404dda33bb0;hb=bddde7799b80b8292879634548c3c92a3cc1c044;hpb=2f1a50d81671810256dce0852e6b1e0810ac44af diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c index 3dc0328..55e503f 100644 --- a/test-tool/test-tool.c +++ b/test-tool/test-tool.c @@ -1,5 +1,5 @@ /* libguestfs-test-tool - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009-2011 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,27 +29,47 @@ #include #include #include +#include +#include #include #ifdef HAVE_GETTEXT #include "gettext.h" #define _(str) dgettext(PACKAGE, (str)) -#define N_(str) dgettext(PACKAGE, (str)) +//#define N_(str) dgettext(PACKAGE, (str)) #else #define _(str) str -#define N_(str) str +//#define N_(str) str #endif -#define DEFAULT_TIMEOUT 120 +#if !ENABLE_NLS +#undef textdomain +#define textdomain(Domainname) /* empty */ +#undef bindtextdomain +#define bindtextdomain(Domainname, Dirname) /* empty */ +#endif + +#define STREQ(a,b) (strcmp((a),(b)) == 0) +//#define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) +//#define STRNEQ(a,b) (strcmp((a),(b)) != 0) +//#define STRCASENEQ(a,b) (strcasecmp((a),(b)) != 0) +#define STREQLEN(a,b,n) (strncmp((a),(b),(n)) == 0) +//#define STRCASEEQLEN(a,b,n) (strncasecmp((a),(b),(n)) == 0) +//#define STRNEQLEN(a,b,n) (strncmp((a),(b),(n)) != 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 600 -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 guestfs_h *g; -static void preruncheck (void); static void make_files (void); static void set_qemu (const char *path, int use_wrapper); @@ -57,28 +77,31 @@ static void usage (void) { printf (_("libguestfs-test-tool: interactive test tool\n" - "Copyright (C) 2009 Red Hat Inc.\n" + "Copyright (C) 2009-2011 Red Hat Inc.\n" "Usage:\n" " libguestfs-test-tool [--options]\n" "Options:\n" " --help Display usage\n" - " --helper libguestfs-test-tool-helper\n" - " Helper program (default: %s)\n" " --qemudir dir Specify QEMU source directory\n" " --qemu qemu Specify QEMU binary\n" " --timeout n\n" " -t n Set launch timeout (default: %d seconds)\n" ), - DEFAULT_HELPER, DEFAULT_TIMEOUT); + DEFAULT_TIMEOUT); } +extern char **environ; + int main (int argc, char *argv[]) { - static const char *options = "?"; + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEBASEDIR); + textdomain (PACKAGE); + + static const char *options = "t:?"; static const struct option long_options[] = { { "help", 0, 0, '?' }, - { "helper", 1, 0, 0 }, { "qemu", 1, 0, 0 }, { "qemudir", 1, 0, 0 }, { "timeout", 1, 0, 't' }, @@ -86,13 +109,8 @@ main (int argc, char *argv[]) }; int c; int option_index; - extern char **environ; int i; struct guestfs_version *vers; - char *sfdisk_lines[] = { ",", NULL }; - char *str; - /* XXX This is wrong if the user renames the helper. */ - char *helper_args[] = { "/iso/libguestfs-test-tool-helper", NULL }; for (;;) { c = getopt_long (argc, argv, options, long_options, &option_index); @@ -100,17 +118,15 @@ main (int argc, char *argv[]) switch (c) { case 0: /* options which are long only */ - if (strcmp (long_options[option_index].name, "helper") == 0) - helper = optarg; - else if (strcmp (long_options[option_index].name, "qemu") == 0) + if (STREQ (long_options[option_index].name, "qemu")) set_qemu (optarg, 0); - else if (strcmp (long_options[option_index].name, "qemudir") == 0) + else if (STREQ (long_options[option_index].name, "qemudir")) set_qemu (optarg, 1); else { fprintf (stderr, _("libguestfs-test-tool: unknown long option: %s (%d)\n"), long_options[option_index].name, option_index); - exit (1); + exit (EXIT_FAILURE); } break; @@ -119,23 +135,22 @@ main (int argc, char *argv[]) fprintf (stderr, _("libguestfs-test-tool: invalid timeout: %s\n"), optarg); - exit (1); + exit (EXIT_FAILURE); } break; case '?': usage (); - exit (0); + exit (EXIT_SUCCESS); default: fprintf (stderr, _("libguestfs-test-tool: unexpected command line option 0x%x\n"), c); - exit (1); + exit (EXIT_FAILURE); } } - preruncheck (); make_files (); printf ("===== Test starts here =====\n"); @@ -145,62 +160,67 @@ main (int argc, char *argv[]) /* Print out any environment variables which may relate to this test. */ for (i = 0; environ[i] != NULL; ++i) - if (strncmp (environ[i], "LIBGUESTFS_", 11) == 0) + if (STREQLEN (environ[i], "LIBGUESTFS_", 11)) printf ("%s\n", environ[i]); + for (i = 0; environ[i] != NULL; ++i) + if (STREQLEN (environ[i], "FEBOOTSTRAP_", 12)) + printf ("%s\n", environ[i]); + printf ("TMPDIR=%s\n", getenv ("TMPDIR") ? : "(not set)"); /* Create the handle and configure it. */ g = guestfs_create (); if (g == NULL) { fprintf (stderr, _("libguestfs-test-tool: failed to create libguestfs handle\n")); - exit (1); + 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 (1); - } - if (guestfs_add_drive (g, isof) == -1) { - fprintf (stderr, - _("libguestfs-test-tool: failed to add drive '%s'\n"), - isof); - exit (1); + exit (EXIT_FAILURE); } /* Print any version info etc. */ vers = guestfs_version (g); if (vers == NULL) { fprintf (stderr, _("libguestfs-test-tool: guestfs_version failed\n")); - exit (1); + exit (EXIT_FAILURE); } printf ("library version: %"PRIi64".%"PRIi64".%"PRIi64"%s\n", vers->major, vers->minor, vers->release, vers->extra); guestfs_free_version (vers); printf ("guestfs_get_append: %s\n", guestfs_get_append (g) ? : "(null)"); + printf ("guestfs_get_attach_method: %s\n", + guestfs_get_attach_method (g) ? : "(null)"); printf ("guestfs_get_autosync: %d\n", guestfs_get_autosync (g)); + printf ("guestfs_get_direct: %d\n", guestfs_get_direct (g)); printf ("guestfs_get_memsize: %d\n", guestfs_get_memsize (g)); + printf ("guestfs_get_network: %d\n", guestfs_get_network (g)); printf ("guestfs_get_path: %s\n", guestfs_get_path (g)); + printf ("guestfs_get_pgroup: %d\n", guestfs_get_pgroup (g)); printf ("guestfs_get_qemu: %s\n", guestfs_get_qemu (g)); + printf ("guestfs_get_recovery_proc: %d\n", + guestfs_get_recovery_proc (g)); + printf ("guestfs_get_selinux: %d\n", guestfs_get_selinux (g)); + printf ("guestfs_get_trace: %d\n", guestfs_get_trace (g)); printf ("guestfs_get_verbose: %d\n", guestfs_get_verbose (g)); - /* Launch the guest handle. */ - if (guestfs_launch (g) == -1) { - fprintf (stderr, - _("libguestfs-test-tool: failed to launch appliance\n")); - exit (1); - } + printf ("host_cpu: %s\n", host_cpu); + /* Launch the guest handle. */ printf ("Launching appliance, timeout set to %d seconds.\n", timeout); fflush (stdout); alarm (timeout); - if (guestfs_wait_ready (g) == -1) { + if (guestfs_launch (g) == -1) { fprintf (stderr, - _("libguestfs-test-tool: failed or timed out in 'wait_ready'\n")); - exit (1); + _("libguestfs-test-tool: failed to launch appliance\n")); + exit (EXIT_FAILURE); } alarm (0); @@ -209,50 +229,37 @@ main (int argc, char *argv[]) fflush (stdout); /* Create the filesystem and mount everything. */ - if (guestfs_sfdiskM (g, "/dev/sda", sfdisk_lines) == -1) { + if (guestfs_part_disk (g, "/dev/sda", "mbr") == -1) { fprintf (stderr, - _("libguestfs-test-tool: failed to run sfdisk\n")); - exit (1); + _("libguestfs-test-tool: failed to run part-disk\n")); + exit (EXIT_FAILURE); } if (guestfs_mkfs (g, "ext2", "/dev/sda1") == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to mkfs.ext2\n")); - exit (1); + exit (EXIT_FAILURE); } - if (guestfs_mount (g, "/dev/sda1", "/") == -1) { + if (guestfs_mount_options (g, "", "/dev/sda1", "/") == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to mount /dev/sda1 on /\n")); - exit (1); - } - - if (guestfs_mkdir (g, "/iso") == -1) { - fprintf (stderr, - _("libguestfs-test-tool: failed to mkdir /iso\n")); - exit (1); - } - - if (guestfs_mount (g, "/dev/sdb", "/iso") == -1) { - fprintf (stderr, - _("libguestfs-test-tool: failed to mount /dev/sdb on /iso\n")); - exit (1); + exit (EXIT_FAILURE); } - /* Let's now run some simple tests using the helper program. */ - str = guestfs_command (g, helper_args); - if (str == NULL) { + /* Touch a file. */ + if (guestfs_touch (g, "/hello") == -1) { fprintf (stderr, - _("libguestfs-test-tool: could not run helper program, or helper failed\n")); - exit (1); + _("libguestfs-test-tool: failed to touch file\n")); + exit (EXIT_FAILURE); } - free (str); + /* Booted and performed some simple operations -- success! */ printf ("===== TEST FINISHED OK =====\n"); - exit (0); + 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) @@ -276,7 +283,7 @@ set_qemu (const char *path, int use_wrapper) fprintf (stderr, _("LIBGUESTFS_QEMU environment variable is already set, so\n" "--qemu/--qemudir options cannot be used.\n")); - exit (1); + exit (EXIT_FAILURE); } if (!use_wrapper) { @@ -284,7 +291,7 @@ set_qemu (const char *path, int use_wrapper) fprintf (stderr, _("Binary '%s' does not exist or is not executable\n"), path); - exit (1); + exit (EXIT_FAILURE); } setenv ("LIBGUESTFS_QEMU", path, 1); @@ -298,14 +305,14 @@ set_qemu (const char *path, int use_wrapper) fprintf (stderr, _("%s: does not look like a qemu source directory\n"), path); - exit (1); + exit (EXIT_FAILURE); } /* Make a wrapper script. */ fd = mkstemp (qemuwrapper); if (fd == -1) { perror (qemuwrapper); - exit (1); + exit (EXIT_FAILURE); } fchmod (fd, 0700); @@ -332,106 +339,39 @@ set_qemu (const char *path, int use_wrapper) atexit (cleanup_wrapper); } -/* After getting the command line args, but before running - * anything, we check everything is in place to do the tests. - */ -static void -preruncheck (void) -{ - int r; - FILE *fp; - char cmd[256]; - char buffer[1024]; - - if (access (helper, R_OK) == -1) { - fprintf (stderr, - _("Test tool helper program 'libguestfs-test-tool-helper' is not\n" - "available. Expected to find it in '%s'\n" - "\n" - "Use the --helper option to specify the location of this program.\n"), - helper); - exit (1); - } - - snprintf (cmd, sizeof cmd, "file '%s'", helper); - fp = popen (cmd, "r"); - if (fp == NULL) { - perror (cmd); - exit (1); - } - r = fread (buffer, 1, sizeof buffer - 1, fp); - if (r == 0) { - fprintf (stderr, _("command failed: %s"), cmd); - exit (1); - } - pclose (fp); - buffer[r] = '\0'; - - if (strstr (buffer, "statically linked") == NULL) { - fprintf (stderr, - _("Test tool helper program %s\n" - "is not statically linked. This is a build error when this test tool\n" - "was built.\n"), - helper); - exit (1); - } -} - static void cleanup_tmpfiles (void) { unlink (tmpf); - unlink (isof); } static void make_files (void) { - int fd, r; - char cmd[256]; - - /* Make the ISO which will contain the helper program. */ - fd = mkstemp (isof); - if (fd == -1) { - perror (isof); - exit (1); - } - close (fd); - - snprintf (cmd, sizeof cmd, "mkisofs -quiet -rJT -o '%s' '%s'", - isof, helper); - r = system (cmd); - if (r == -1 || WEXITSTATUS(r) != 0) { - fprintf (stderr, - _("mkisofs command failed: %s\n"), cmd); - exit (1); - } + int fd; /* Allocate the sparse file for /dev/sda. */ fd = mkstemp (tmpf); if (fd == -1) { perror (tmpf); - unlink (isof); - exit (1); + exit (EXIT_FAILURE); } if (lseek (fd, 100 * 1024 * 1024 - 1, SEEK_SET) == -1) { perror ("lseek"); close (fd); unlink (tmpf); - unlink (isof); - exit (1); + exit (EXIT_FAILURE); } if (write (fd, "\0", 1) == -1) { perror ("write"); close (fd); unlink (tmpf); - unlink (isof); - exit (1); + exit (EXIT_FAILURE); } close (fd); - atexit (cleanup_tmpfiles); /* Removes tmpf and isof. */ + atexit (cleanup_tmpfiles); /* Removes tmpf. */ }