X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argp-2.sh;h=a3c2fe55e13b5215a86c47a22f0648967593076c;hb=8df2459e40ab2ee726f4532c0699d4f7a40717d0;hp=2bd8d95c5952e351cbbcd1b09b51090d1e5edf4e;hpb=6e714e7a1e47ada667d0a7db1cef42e9fe7d21f0;p=gnulib.git

diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index 2bd8d95c5..a3c2fe55e 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 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008 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,16 +22,21 @@ unset ARGP_HELP_FMT
 ERR=0
 
 func_compare() {
-# If argp was compiled without base_name, it will display full program name
-  sed '1{s,: [^ ]*/test-argp,: test-argp,;}' | cmp - $TMP
-}  
+# 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,
+         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] [-o[ARG]] [--test] [--file=FILE]
+            [--input=FILE] [--verbose] [--cantiga] [--sonet] [--option]
+            [--optional[=ARG]] [--limerick] [--poem] [--help] [--usage]
+            [--version] ARGS...
 EOT
 
 ./test-argp --usage | func_compare || ERR=1
@@ -41,9 +45,9 @@ EOT
 # 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]
-[--version] ARGS...
+Usage: test-argp [-tvCSOlp?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
+[--input=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
@@ -61,18 +65,27 @@ documentation string
   -f, --file=FILE, --input=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
 
-  -?, --help                 Give this help list
-      --usage                Give a short usage message
-  -V, --version              Print program version
+ 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
 
 Mandatory or optional arguments to long options are also mandatory or optional
 for any corresponding short options.
@@ -87,6 +100,10 @@ EOT
 
 ./test-argp --optio 2>/dev/null && ERR=1
 
+####
+# Run built-in tests
+./test-argp || ERR=1
+
 rm $TMP
 
 exit $ERR