X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argp-2.sh;h=5c0c64ce6af7fd9677ed4341ffd468e796149a0d;hb=2988c8c21303fdadb3a9efe321870d96f6bdc668;hp=7d73f5ccd608b2b48faaff531b34f47e0990432b;hpb=122d84991204bc27f91b2603ca1b3331310ee8cb;p=gnulib.git

diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index 7d73f5ccd..5c0c64ce6 100755
--- a/tests/test-argp-2.sh
+++ b/tests/test-argp-2.sh
@@ -1,21 +1,20 @@
 #! /bin/sh
 # Test suite for argp.
-# Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 TMP=argp.$$
 
@@ -23,32 +22,36 @@ unset ARGP_HELP_FMT
 ERR=0
 
 func_compare() {
-# If argp was compiled without base_name, it will display full program name
+# If argp was compiled without base_name, it will display full program name.
+# If run on mingw, it will display the program name with a .exe suffix.
   sed '1{
          s,: [^ ]*/test-argp,: test-argp,
-        }' | diff -c $TMP -
-}  
+         s,: test-argp\.exe,: test-argp,
+        }' | LC_ALL=C tr -d '\r' | diff -c $TMP -
+}
 
 ####
 # Test --usage output
 cat > $TMP <<EOT
-Usage: test-argp [-tvO?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
-            [--input=FILE] [--verbose] [--optional[=ARG]] [--option] [--help]
-            [--usage] [--version] ARGS...
+Usage: test-argp [-tvCSOlp?V] [-f FILE] [-r FILE] [-o[ARG]] [--test]
+            [--file=FILE] [--input=FILE] [--read=FILE] [--verbose] [--cantiga]
+            [--sonet] [--option] [--optional[=ARG]] [--limerick] [--poem]
+            [--help] [--usage] [--version] ARGS...
 EOT
 
-./test-argp --usage | func_compare || ERR=1
+./test-argp$EXEEXT --usage | func_compare || ERR=1
 
 ####
 # Test working usage-indent format
 
 cat > $TMP <<EOT
-Usage: test-argp [-tvO?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
-[--input=FILE] [--verbose] [--optional[=ARG]] [--option] [--help] [--usage]
+Usage: test-argp [-tvCSOlp?V] [-f FILE] [-r FILE] [-o[ARG]] [--test]
+[--file=FILE] [--input=FILE] [--read=FILE] [--verbose] [--cantiga] [--sonet]
+[--option] [--optional[=ARG]] [--limerick] [--poem] [--help] [--usage]
 [--version] ARGS...
 EOT
 
-ARGP_HELP_FMT='usage-indent=0' ./test-argp --usage | func_compare || ERR=1
+ARGP_HELP_FMT='usage-indent=0' ./test-argp$EXEEXT --usage | func_compare || ERR=1
 
 ####
 # Test --help output
@@ -60,18 +63,28 @@ documentation string
   -t, --test
 
  Option Group 1
-  -f, --file=FILE, --input=FILE   Option with a mandatory argument
+  -f, -r, --file=FILE, --input=FILE, --read=FILE
+                             Option with a mandatory argument
   -v, --verbose              Simple option without arguments
 
+ Option Group 1.1
+  -C, --cantiga              create a cantiga
+  -S, --sonet                create a sonet
+
  Option Group 2
+  -O, --option               An option
+
   -o, --optional[=ARG]       Option with an optional argument. ARG is one of
                              the following:
-  -O, --option               An option
 
   many                       many units
   one                        one unit
   two                        two units
 
+ Option Group 2.1
+  -l, --limerick             create a limerick
+  -p, --poem                 create a poem
+
   -?, --help                 give this help list
       --usage                give a short usage message
   -V, --version              print program version
@@ -82,12 +95,18 @@ for any corresponding short options.
 Report bugs to <>.
 EOT
 
-./test-argp --help | func_compare || ERR=1
+# Compare --help output, but filter out any bug-reporting email address.
+./test-argp$EXEEXT --help \
+    | sed 's/^\(Report bugs to \)<[^>]*>.$/\1<>./' | func_compare || ERR=1
 
 ####
 # Test ambiguous option handling
 
-./test-argp --optio 2>/dev/null && ERR=1
+./test-argp$EXEEXT --optio 2>/dev/null && ERR=1
+
+####
+# Run built-in tests
+./test-argp$EXEEXT || ERR=1
 
 rm $TMP