X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=test-tool%2Ftest-tool.c;h=73f3af5cf4de4d0b4c303a72f9d31ecd4a24865f;hb=539bf7e8983c53c4cf79ffa64302bef1585bec31;hp=f37656a7919774b2e73f2f4bfbdd0e61ff357f66;hpb=58e7e42033b1ac5044ae03f0aa5d5082c5fdb497;p=libguestfs.git diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c index f37656a..73f3af5 100644 --- a/test-tool/test-tool.c +++ b/test-tool/test-tool.c @@ -57,25 +57,25 @@ static void usage (void) { printf (_("libguestfs-test-tool: interactive test tool\n" - "Copyright (C) 2009 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); + "Copyright (C) 2009 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); } int main (int argc, char *argv[]) { - static const char *options = "?"; + static const char *options = "t:?"; static const struct option long_options[] = { { "help", 0, 0, '?' }, { "helper", 1, 0, 0 }, @@ -100,26 +100,26 @@ 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) - set_qemu (optarg, 0); - else if (strcmp (long_options[option_index].name, "qemudir") == 0) - set_qemu (optarg, 1); + if (STREQ (long_options[option_index].name, "helper")) + helper = optarg; + else if (STREQ (long_options[option_index].name, "qemu")) + set_qemu (optarg, 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); + fprintf (stderr, + _("libguestfs-test-tool: unknown long option: %s (%d)\n"), + long_options[option_index].name, option_index); + exit (1); } break; case 't': if (sscanf (optarg, "%d", &timeout) != 1 || timeout < 0) { - fprintf (stderr, - _("libguestfs-test-tool: invalid timeout: %s\n"), - optarg); - exit (1); + fprintf (stderr, + _("libguestfs-test-tool: invalid timeout: %s\n"), + optarg); + exit (1); } break; @@ -129,8 +129,8 @@ main (int argc, char *argv[]) default: fprintf (stderr, - _("libguestfs-test-tool: unexpected command line option 0x%x\n"), - c); + _("libguestfs-test-tool: unexpected command line option 0x%x\n"), + c); exit (1); } } @@ -145,26 +145,26 @@ 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]); /* Create the handle and configure it. */ g = guestfs_create (); if (g == NULL) { fprintf (stderr, - _("libguestfs-test-tool: failed to create libguestfs handle\n")); + _("libguestfs-test-tool: failed to create libguestfs handle\n")); exit (1); } if (guestfs_add_drive (g, tmpf) == -1) { fprintf (stderr, - _("libguestfs-test-tool: failed to add drive '%s'\n"), - tmpf); + _("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); + _("libguestfs-test-tool: failed to add drive '%s'\n"), + isof); exit (1); } @@ -175,7 +175,7 @@ main (int argc, char *argv[]) exit (1); } printf ("library version: %"PRIi64".%"PRIi64".%"PRIi64"%s\n", - vers->major, vers->minor, vers->release, vers->extra); + vers->major, vers->minor, vers->release, vers->extra); guestfs_free_version (vers); printf ("guestfs_get_append: %s\n", guestfs_get_append (g) ? : "(null)"); @@ -186,20 +186,14 @@ main (int argc, char *argv[]) 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 ("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")); + _("libguestfs-test-tool: failed to launch appliance\n")); exit (1); } @@ -211,31 +205,31 @@ main (int argc, char *argv[]) /* Create the filesystem and mount everything. */ if (guestfs_sfdiskM (g, "/dev/sda", sfdisk_lines) == -1) { fprintf (stderr, - _("libguestfs-test-tool: failed to run sfdisk\n")); + _("libguestfs-test-tool: failed to run sfdisk\n")); exit (1); } if (guestfs_mkfs (g, "ext2", "/dev/sda1") == -1) { fprintf (stderr, - _("libguestfs-test-tool: failed to mkfs.ext2\n")); + _("libguestfs-test-tool: failed to mkfs.ext2\n")); exit (1); } if (guestfs_mount (g, "/dev/sda1", "/") == -1) { fprintf (stderr, - _("libguestfs-test-tool: failed to mount /dev/sda1 on /\n")); + _("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")); + _("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")); + _("libguestfs-test-tool: failed to mount /dev/sdb on /iso\n")); exit (1); } @@ -243,7 +237,7 @@ main (int argc, char *argv[]) str = guestfs_command (g, helper_args); if (str == NULL) { fprintf (stderr, - _("libguestfs-test-tool: could not run helper program, or helper failed\n")); + _("libguestfs-test-tool: could not run helper program, or helper failed\n")); exit (1); } free (str); @@ -282,8 +276,8 @@ set_qemu (const char *path, int use_wrapper) if (!use_wrapper) { if (access (path, X_OK) == -1) { fprintf (stderr, - _("Binary '%s' does not exist or is not executable\n"), - path); + _("Binary '%s' does not exist or is not executable\n"), + path); exit (1); } @@ -296,8 +290,8 @@ set_qemu (const char *path, int use_wrapper) if (stat (buffer, &statbuf) == -1 || !S_ISDIR (statbuf.st_mode)) { fprintf (stderr, - _("%s: does not look like a qemu source directory\n"), - path); + _("%s: does not look like a qemu source directory\n"), + path); exit (1); } @@ -312,10 +306,10 @@ set_qemu (const char *path, int use_wrapper) fp = fdopen (fd, "w"); fprintf (fp, - "#!/bin/sh -\n" - "qemudir='%s'\n" - "\"$qemudir\"/", - path); + "#!/bin/sh -\n" + "qemudir='%s'\n" + "\"$qemudir\"/", + path); /* Select the right qemu binary for the wrapper script. */ #ifdef __i386__ @@ -349,7 +343,7 @@ preruncheck (void) "available. Expected to find it in '%s'\n" "\n" "Use the --helper option to specify the location of this program.\n"), - helper); + helper); exit (1); } @@ -372,7 +366,7 @@ preruncheck (void) _("Test tool helper program %s\n" "is not statically linked. This is a build error when this test tool\n" "was built.\n"), - helper); + helper); exit (1); } } @@ -399,11 +393,11 @@ make_files (void) close (fd); snprintf (cmd, sizeof cmd, "mkisofs -quiet -rJT -o '%s' '%s'", - isof, helper); + isof, helper); r = system (cmd); if (r == -1 || WEXITSTATUS(r) != 0) { fprintf (stderr, - _("mkisofs command failed: %s\n"), cmd); + _("mkisofs command failed: %s\n"), cmd); exit (1); }