X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argp.c;h=8fab727c9ae55f31a36fbdff7450ea129f6fc5d2;hb=b302fb5c83f46846a5bb7b57de878350f4a5c070;hp=7f58ae0df634d1a3b812312304b8bbadd2764cc1;hpb=6b2ebc2a29a08c189e688179b04345e35d95af4f;p=gnulib.git

diff --git a/tests/test-argp.c b/tests/test-argp.c
index 7f58ae0df..8fab727c9 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-2011 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;
@@ -47,6 +46,7 @@ static struct argp_option group1_option[] = {
   { "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 }
 };
@@ -62,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;
@@ -223,7 +226,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     {
     case ARGP_KEY_INIT:
       for (i = 0; state->root_argp->children[i].argp; i++)
-	state->child_inputs[i] = args;
+        state->child_inputs[i] = args;
       break;
 
     case 't':
@@ -257,20 +260,20 @@ 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;
@@ -343,7 +346,7 @@ test6 (struct argp *argp)
 
 void
 test_optional (struct argp *argp, int argc, char **argv,
-	       struct test_args *args, char *val, char *a)
+               struct test_args *args, const char *val, const char *a)
 {
   int index;
   if (argp_parse (argp, argc, argv, 0, &index, args))
@@ -354,7 +357,7 @@ test_optional (struct argp *argp, int argc, char **argv,
   if (!val)
     {
       if (args->optional)
-	fail ("option processed incorrectly");
+        fail ("option processed incorrectly");
     }
   else if (strcmp (args->optional, val))
     fail ("option processed incorrectly");
@@ -362,9 +365,9 @@ test_optional (struct argp *argp, int argc, char **argv,
   if (a)
     {
       if (index == argc)
-	fail ("expected command line argument not found");
+        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 does not match");
     }
 }
 
@@ -430,6 +433,14 @@ test14 (struct argp *argp)
     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);
@@ -438,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
 };