render-test: Add --no-txt and --no-stdout options.

[pspp] / tests / output / render-test.c

diff --git a/tests/output/render-test.c b/tests/output/render-test.c
index b996e644cb10a7176954cd47cc8f97f8bf30c16a..ab1045926e289a3365a82f1bb5cece063650952e 100644 (file)
--- a/tests/output/render-test.c
+++ b/tests/output/render-test.c
@@ -47,12 +47,21 @@ static char *box;
 /* --draw-mode: special ASCII driver test mode. */
 static int draw_mode;
 
+/* --no-txt: Whether to render to <base>.txt. */
+static int render_txt = true;
+
+/* --no-stdout: Whether to render to stdout. */
+static int render_stdout = true;
+
 /* --pdf: Also render PDF output. */
 static int render_pdf;
 
 /* 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 *);
@@ -124,30 +133,41 @@ configure_drivers (int width, int length, int min_break)
     string_map_insert (&options, "box", box);
 
   /* Render to stdout. */
-  string_map_clone (&tmp, &options);
-  ascii_driver = driver = output_driver_create (&tmp);
-  if (driver == NULL)
-    exit (EXIT_FAILURE);
-  output_driver_register (driver);
-  string_map_destroy (&tmp);
+  if (render_stdout)
+    {
+      string_map_clone (&tmp, &options);
+      ascii_driver = driver = output_driver_create (&tmp);
+      if (driver == NULL)
+        exit (EXIT_FAILURE);
+      output_driver_register (driver);
+      string_map_destroy (&tmp);
+    }
 
   if (draw_mode)
    {
-    string_map_destroy (&options);
-    return;
+     string_map_destroy (&options);
+     return;
    }
 
-  /* Render to render.txt. */
-  string_map_replace (&options, "output-file", "render.txt");
-  driver = output_driver_create (&options);
-  if (driver == NULL)
-    exit (EXIT_FAILURE);
-  output_driver_register (driver);
+  /* Render to <base>.txt. */
+  if (render_txt)
+    {
+      string_map_clear (&options);
+      string_map_insert_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
+  /* Render to <base>.pdf. */
   if (render_pdf)
     {
-      string_map_insert (&options, "output-file", "render.pdf");
+      string_map_clear (&options);
+      string_map_insert_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");
@@ -168,7 +188,9 @@ configure_drivers (int width, int length, int min_break)
     }
 #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);
@@ -203,12 +225,15 @@ parse_options (int argc, char **argv)
           {"emphasis", required_argument, NULL, OPT_EMPHASIS},
           {"box", required_argument, NULL, OPT_BOX},
           {"draw-mode", no_argument, &draw_mode, 1},
+          {"no-txt", no_argument, &render_txt, 0},
+          {"no-stdout", no_argument, &render_stdout, 0},
           {"pdf", no_argument, &render_pdf, 1},
+          {"output", required_argument, NULL, 'o'},
           {"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;
 
@@ -234,6 +259,10 @@ parse_options (int argc, char **argv)
           box = optarg;
           break;
 
+        case 'o':
+          output_base = optarg;
+          break;
+
         case OPT_HELP:
           usage ();