Rename search_.h to search.in.h.

[gnulib.git] / tests / test-argp-2.sh

diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index 2bd8d95..31fbb31 100755 (executable)
--- a/tests/test-argp-2.sh
+++ b/tests/test-argp-2.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for argp.
 #! /bin/sh
 # Test suite for argp.

-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007 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 file is part of the GNUlib Library.
 #
 # This program is free software; you can redistribute it and/or modify


@@ -23,16 +23,21 @@ unset ARGP_HELP_FMT
 ERR=0
 
 func_compare() {
 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,
+        }' | diff -c $TMP -

 }  
 
 ####
 # Test --usage output
 cat > $TMP <<EOT
 }  
 
 ####
 # 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
 EOT
 
 ./test-argp --usage | func_compare || ERR=1


@@ -41,9 +46,9 @@ EOT
 # Test working usage-indent format
 
 cat > $TMP <<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
 EOT
 
 ARGP_HELP_FMT='usage-indent=0' ./test-argp --usage | func_compare || ERR=1


@@ -61,18 +66,27 @@ documentation string
   -f, --file=FILE, --input=FILE   Option with a mandatory argument
   -v, --verbose              Simple option without arguments
 
   -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
  Option Group 2

+  -O, --option               An option
+

   -o, --optional[=ARG]       Option with an optional argument. ARG is one of
                              the following:
   -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
 
 
   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.
 
 Mandatory or optional arguments to long options are also mandatory or optional
 for any corresponding short options.


@@ -87,6 +101,10 @@ EOT
 
 ./test-argp --optio 2>/dev/null && ERR=1
 
 
 ./test-argp --optio 2>/dev/null && ERR=1
 

+####
+# Run built-in tests
+./test-argp || ERR=1
+

 rm $TMP
 
 exit $ERR
 rm $TMP
 
 exit $ERR