projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88f5e73
)
render-test: Add output file option.
author
Ben Pfaff
<blp@cs.stanford.edu>
Tue, 15 Jul 2014 07:05:07 +0000
(
00:05
-0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 20 Jul 2014 00:44:44 +0000
(17:44 -0700)
tests/output/render-test.c
patch
|
blob
|
history
diff --git
a/tests/output/render-test.c
b/tests/output/render-test.c
index b996e644cb10a7176954cd47cc8f97f8bf30c16a..24443607859caf822f36ef6ea52f8d9c4779d11a 100644
(file)
--- a/
tests/output/render-test.c
+++ b/
tests/output/render-test.c
@@
-53,6
+53,9
@@
static int render_pdf;
/* ASCII driver, for ASCII driver test mode. */
static struct output_driver *ascii_driver;
/* ASCII driver, for ASCII driver test mode. */
static struct output_driver *ascii_driver;
+/* -o, --output: Base name for output files. */
+static const char *output_base = "render";
+
static const char *parse_options (int argc, char **argv);
static void usage (void) NO_RETURN;
static struct table *read_table (FILE *);
static const char *parse_options (int argc, char **argv);
static void usage (void) NO_RETURN;
static struct table *read_table (FILE *);
@@
-137,17
+140,20
@@
configure_drivers (int width, int length, int min_break)
return;
}
return;
}
- /* Render to render.txt. */
- string_map_replace (&options, "output-file", "render.txt");
+ /* Render to <base>.txt. */
+ string_map_replace_nocopy (&options, xstrdup ("output-file"),
+ xasprintf ("%s.txt", output_base));
driver = output_driver_create (&options);
if (driver == NULL)
exit (EXIT_FAILURE);
output_driver_register (driver);
#ifdef HAVE_CAIRO
driver = output_driver_create (&options);
if (driver == NULL)
exit (EXIT_FAILURE);
output_driver_register (driver);
#ifdef HAVE_CAIRO
+ /* Render to <base>.txt. */
if (render_pdf)
{
if (render_pdf)
{
- string_map_insert (&options, "output-file", "render.pdf");
+ string_map_replace_nocopy (&options, xstrdup ("output-file"),
+ xasprintf ("%s.pdf", output_base));
string_map_insert (&options, "top-margin", "0");
string_map_insert (&options, "bottom-margin", "0");
string_map_insert (&options, "left-margin", "0");
string_map_insert (&options, "top-margin", "0");
string_map_insert (&options, "bottom-margin", "0");
string_map_insert (&options, "left-margin", "0");
@@
-168,7
+174,9
@@
configure_drivers (int width, int length, int min_break)
}
#endif
}
#endif
- string_map_insert (&options, "output-file", "render.odt");
+ /* Render to <base>.odt. */
+ string_map_replace_nocopy (&options, xstrdup ("output-file"),
+ xasprintf ("%s.odt", output_base));
driver = output_driver_create (&options);
if (driver == NULL)
exit (EXIT_FAILURE);
driver = output_driver_create (&options);
if (driver == NULL)
exit (EXIT_FAILURE);
@@
-204,11
+212,12
@@
parse_options (int argc, char **argv)
{"box", required_argument, NULL, OPT_BOX},
{"draw-mode", no_argument, &draw_mode, 1},
{"pdf", no_argument, &render_pdf, 1},
{"box", required_argument, NULL, OPT_BOX},
{"draw-mode", no_argument, &draw_mode, 1},
{"pdf", no_argument, &render_pdf, 1},
+ {"output", required_argument, NULL, 'o'},
{"help", no_argument, NULL, OPT_HELP},
{NULL, 0, NULL, 0},
};
{"help", no_argument, NULL, OPT_HELP},
{NULL, 0, NULL, 0},
};
- int c = getopt_long (argc, argv, "", options, NULL);
+ int c = getopt_long (argc, argv, "
o:
", options, NULL);
if (c == -1)
break;
if (c == -1)
break;
@@
-234,6
+243,10
@@
parse_options (int argc, char **argv)
box = optarg;
break;
box = optarg;
break;
+ case 'o':
+ output_base = optarg;
+ break;
+
case OPT_HELP:
usage ();
case OPT_HELP:
usage ();