X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argp.c;h=a96dee86a12631d77f9ea6fdfc80bf095f5996d2;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=14ed52d87c67db3230627f8b3ba4934b51e2498c;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/tests/test-argp.c b/tests/test-argp.c
index 14ed52d87..a96dee86a 100644
--- a/tests/test-argp.c
+++ b/tests/test-argp.c
@@ -1,5 +1,5 @@
 /* Test suite for argp.
-   Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
    This file is part of the GNUlib Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -21,9 +21,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#if HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 #if HAVE_STRINGS_H
 # include <strings.h>
 #endif
@@ -34,6 +32,7 @@ struct test_args
   int test;
   int verbose;
   char *file;
+  int read;
   char *hidden;
   int opt;
   char *optional;
@@ -42,12 +41,12 @@ struct test_args
   int group_1_1_option;
 };
 
-static struct argp_option group1_option[] =
-{
-  { NULL, 0, NULL, 0, "Option Group 1", 0},
+static struct argp_option group1_option[] = {
+  { NULL, 0, NULL, 0, "Option Group 1", 0 },
   { "verbose", 'v', NULL, 0, "Simple option without arguments", 1 },
   { "file", 'f', "FILE", 0, "Option with a mandatory argument", 1 },
   { "input", 0, NULL, OPTION_ALIAS, NULL, 1 },
+  { "read", 'r', NULL, OPTION_ALIAS, NULL, 1 },
   { "hidden", 'H', "FILE", OPTION_HIDDEN, "Hidden option", 1 },
   { NULL, 0, NULL, 0, NULL, 0 }
 };
@@ -63,6 +62,9 @@ group1_parser (int key, char *arg, struct argp_state *state)
       args->verbose++;
       break;
 
+    case 'r':
+      args->read = 1;
+      /* fall through */
     case 'f':
       args->file = arg;
       break;
@@ -88,11 +90,10 @@ struct argp_child group1_child = {
   "",
   1
 };
-
 
-static struct argp_option group1_1_option[] =
-{
-  { NULL, 0, NULL, 0, "Option Group 1.1", 0},
+
+static struct argp_option group1_1_option[] = {
+  { NULL, 0, NULL, 0, "Option Group 1.1", 0 },
   { "cantiga", 'C', NULL, 0, "create a cantiga" },
   { "sonet", 'S', NULL, 0, "create a sonet" },
   { NULL, 0, NULL, 0, NULL, 0 }
@@ -125,17 +126,16 @@ struct argp_child group1_1_child = {
   "",
   2
 };
-
 
-static struct argp_option group2_option[] =
-{
-  { NULL, 0, NULL, 0, "Option Group 2", 0},
+
+static struct argp_option group2_option[] = {
+  { NULL, 0, NULL, 0, "Option Group 2", 0 },
   { "option", 'O', NULL, 0, "An option", 1 },
   { "optional", 'o', "ARG", OPTION_ARG_OPTIONAL,
     "Option with an optional argument. ARG is one of the following:", 2 },
-  { "one", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, "one unit", 3 },
-  { "two", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, "two units", 3 },
-  { "many", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, "many units", 3 },
+  { "one", 0, NULL, OPTION_DOC | OPTION_NO_TRANS, "one unit", 3 },
+  { "two", 0, NULL, OPTION_DOC | OPTION_NO_TRANS, "two units", 3 },
+  { "many", 0, NULL, OPTION_DOC | OPTION_NO_TRANS, "many units", 3 },
   { NULL, 0, NULL, 0, NULL, 0 }
 };
 
@@ -172,11 +172,10 @@ struct argp_child group2_child = {
   "",
   2
 };
-
 
-static struct argp_option group2_1_option[] =
-{
-  { NULL, 0, NULL, 0, "Option Group 2.1", 0},
+
+static struct argp_option group2_1_option[] = {
+  { NULL, 0, NULL, 0, "Option Group 2.1", 0 },
   { "poem", 'p', NULL, 0, "create a poem" },
   { "limerick", 'l', NULL, 0, "create a limerick" },
   { NULL, 0, NULL, 0, NULL, 0 }
@@ -209,14 +208,13 @@ struct argp_child group2_1_child = {
   "",
   2
 };
-
 
-static struct argp_option main_options[] =
-  {
-    { NULL, 0, NULL, 0, "Main options", 0},
-    { "test", 't', NULL, 0, NULL, 1 },
-    { NULL, 0, NULL, 0, NULL, 0 }
-  };
+
+static struct argp_option main_options[] = {
+  { NULL, 0, NULL, 0, "Main options", 0 },
+  { "test", 't', NULL, 0, NULL, 1 },
+  { NULL, 0, NULL, 0, NULL, 0 }
+};
 
 static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
@@ -262,179 +260,187 @@ struct argp test_argp = {
 #define INIT_TEST_COMMON(n)     \
  int argc = NARGS (argv);       \
  struct test_args test_args;    \
- init_args(test_args);          \
+ init_args (test_args);         \
  test_number = n;
 
 #define INIT_TEST1(n, arg1)            \
  char *argv[] = { ARGV0, arg1, NULL }; \
- INIT_TEST_COMMON(n)
+ INIT_TEST_COMMON (n)
 
 #define INIT_TEST2(n, arg1, arg2)            \
  char *argv[] = { ARGV0, arg1, arg2, NULL }; \
- INIT_TEST_COMMON(n)
+ INIT_TEST_COMMON (n)
 
 #define INIT_TEST3(n, arg1, arg2, arg3)            \
  char *argv[] = { ARGV0, arg1, arg2, arg3, NULL }; \
- INIT_TEST_COMMON(n)
+ INIT_TEST_COMMON (n)
 
 int test_number;
 unsigned failure_count = 0;
 
 void
-fail(const char *msg)
+fail (const char *msg)
 {
-  fprintf(stderr, "Test %d: %s\n", test_number, msg);
+  fprintf (stderr, "Test %d: %s\n", test_number, msg);
   failure_count++;
 }
 
 void
-test1(struct argp *argp)
+test1 (struct argp *argp)
 {
   INIT_TEST1 (1, "--test");
   if (argp_parse (argp, argc, argv, 0, NULL, &test_args))
-    fail("argp_parse failed");
+    fail ("argp_parse failed");
   else if (test_args.test != 1)
-    fail("option not processed");
+    fail ("option not processed");
 }
 
 void
-test2(struct argp *argp)
+test2 (struct argp *argp)
 {
   INIT_TEST1 (2, "-t");
   if (argp_parse (argp, argc, argv, 0, NULL, &test_args))
-    fail("argp_parse failed");
+    fail ("argp_parse failed");
   else if (test_args.test != 1)
-    fail("option not processed");
+    fail ("option not processed");
 }
 
 void
-test_file(struct argp *argp, int argc, char **argv, struct test_args *args)
+test_file (struct argp *argp, int argc, char **argv, struct test_args *args)
 {
   if (argp_parse (argp, argc, argv, 0, NULL, args))
-    fail("argp_parse failed");
+    fail ("argp_parse failed");
   else if (!args->file)
-    fail("option not processed");
+    fail ("option not processed");
   else if (strcmp (args->file, "FILE"))
-    fail("option processed incorrectly");
+    fail ("option processed incorrectly");
 }
 
 void
-test3(struct argp *argp)
+test3 (struct argp *argp)
 {
   INIT_TEST1 (3, "--file=FILE");
   test_file (argp, argc, argv, &test_args);
 }
 
 void
-test4(struct argp *argp)
+test4 (struct argp *argp)
 {
   INIT_TEST2 (4, "--file", "FILE");
   test_file (argp, argc, argv, &test_args);
 }
 
 void
-test5(struct argp *argp)
+test5 (struct argp *argp)
 {
   INIT_TEST1 (5, "--input=FILE");
   test_file (argp, argc, argv, &test_args);
 }
 
 void
-test6(struct argp *argp)
+test6 (struct argp *argp)
 {
   INIT_TEST2 (6, "--input", "FILE");
   test_file (argp, argc, argv, &test_args);
 }
 
 void
-test_optional(struct argp *argp, int argc, char **argv,
-              struct test_args *args, char *val, char *a)
+test_optional (struct argp *argp, int argc, char **argv,
+               struct test_args *args, const char *val, const char *a)
 {
   int index;
   if (argp_parse (argp, argc, argv, 0, &index, args))
-    fail("argp_parse failed");
+    fail ("argp_parse failed");
   else if (!args->optional_set)
-    fail("option not processed");
+    fail ("option not processed");
 
   if (!val)
     {
       if (args->optional)
-        fail("option processed incorrectly");
+        fail ("option processed incorrectly");
     }
   else if (strcmp (args->optional, val))
-    fail("option processed incorrectly");
+    fail ("option processed incorrectly");
 
   if (a)
     {
       if (index == argc)
-        fail("expected command line argument not found");
-      else if (strcmp(argv[index], a))
-        fail("expected command line argument does not match");
+        fail ("expected command line argument not found");
+      else if (strcmp (argv[index], a))
+        fail ("expected command line argument does not match");
     }
 }
 
 void
-test7(struct argp *argp)
+test7 (struct argp *argp)
 {
   INIT_TEST1 (7, "-oARG");
-  test_optional(argp, argc, argv, &test_args, "ARG", NULL);
+  test_optional (argp, argc, argv, &test_args, "ARG", NULL);
 }
 
 void
-test8(struct argp *argp)
+test8 (struct argp *argp)
 {
   INIT_TEST2 (8, "-o", "ARG");
-  test_optional(argp, argc, argv, &test_args, NULL, "ARG");
+  test_optional (argp, argc, argv, &test_args, NULL, "ARG");
 }
 
 void
-test9(struct argp *argp)
+test9 (struct argp *argp)
 {
   INIT_TEST1 (9, "--optional=ARG");
-  test_optional(argp, argc, argv, &test_args, "ARG", NULL);
+  test_optional (argp, argc, argv, &test_args, "ARG", NULL);
 }
 
 void
-test10(struct argp *argp)
+test10 (struct argp *argp)
 {
   INIT_TEST2 (10, "--optional", "ARG");
-  test_optional(argp, argc, argv, &test_args, NULL, "ARG");
+  test_optional (argp, argc, argv, &test_args, NULL, "ARG");
 }
 
 void
-test11(struct argp *argp)
+test11 (struct argp *argp)
 {
   INIT_TEST1 (11, "--optiona=ARG");
-  test_optional(argp, argc, argv, &test_args, "ARG", NULL);
+  test_optional (argp, argc, argv, &test_args, "ARG", NULL);
 }
 
 void
-test12(struct argp *argp)
+test12 (struct argp *argp)
 {
   INIT_TEST3 (12, "--option", "--optional=OPT", "FILE");
-  test_optional(argp, argc, argv, &test_args, "OPT", "FILE");
+  test_optional (argp, argc, argv, &test_args, "OPT", "FILE");
 }
 
 void
-test13(struct argp *argp)
+test13 (struct argp *argp)
 {
   INIT_TEST1 (1, "--cantiga");
   if (argp_parse (argp, argc, argv, 0, NULL, &test_args))
-    fail("argp_parse failed");
+    fail ("argp_parse failed");
   else if (test_args.group_1_1_option != 'C')
-    fail("option not processed");
+    fail ("option not processed");
 }
 
 void
-test14(struct argp *argp)
+test14 (struct argp *argp)
 {
   INIT_TEST1 (1, "--limerick");
   if (argp_parse (argp, argc, argv, 0, NULL, &test_args))
-    fail("argp_parse failed");
+    fail ("argp_parse failed");
   else if (test_args.group_2_1_option != 'l')
-    fail("option not processed");
+    fail ("option not processed");
 }
 
+void
+test15 (struct argp *argp)
+{
+  INIT_TEST2 (1, "-r", "FILE");
+  test_file (argp, argc, argv, &test_args);
+  if (!test_args.read)
+    fail ("short alias not recognized properly");
+}
 
 
 typedef void (*test_fp) (struct argp *argp);
@@ -443,7 +449,7 @@ test_fp test_fun[] = {
   test1,  test2,  test3,  test4,
   test5,  test6,  test7,  test8,
   test9,  test10, test11, test12,
-  test13, test14,
+  test13, test14, test15,
   NULL
 };
 
@@ -471,7 +477,7 @@ main (int argc, char **argv)
   if (argc > 0)
     {
       struct test_args test_args;
-      init_args(test_args);
+      init_args (test_args);
       return argp_parse (&test_argp, argc, argv, 0, NULL, &test_args);
     }