Ping!
I could also just go ahead and commit the tests/ part of this,
that would be sufficient to fix the test failure, and avoid glibc
synchronization issues.
* Ralf Wildenhues wrote on Wed, Nov 08, 2006 at 11:49:48PM CET:
>
> 2006-11-08 Ralf Wildenhues <[EMAIL PROTECTED]>
>
> * lib/argp-help.c: Fix comment to match actual output.
> * tests/test-argp-2.sh: Likewise. Fixes test failure.
> (func_compare): Fix sed script to be portable.
>
> Index: lib/argp-help.c
> ===================================================================
> RCS file: /cvsroot/gnulib/gnulib/lib/argp-help.c,v
> retrieving revision 1.25
> diff -u -r1.25 argp-help.c
> --- lib/argp-help.c 12 Sep 2006 09:06:40 -0000 1.25
> +++ lib/argp-help.c 8 Nov 2006 22:45:25 -0000
> @@ -1,5 +1,5 @@
> /* Hierarchial argument parsing help output
> - Copyright (C) 1995-2003, 2004, 2005 Free Software Foundation, Inc.
> + Copyright (C) 1995-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
> This file is part of the GNU C Library.
> Written by Miles Bader <[EMAIL PROTECTED]>.
>
> @@ -302,9 +302,9 @@
> -f ZOT, --foonly=ZOT Glork a foonly
> -z, --zaza Snit a zar
>
> - -?, --help Give this help list
> - --usage Give a short usage message
> - -V, --version Print program version
> + -?, --help give this help list
> + --usage give a short usage message
> + -V, --version print program version
>
> The struct argp_option array for the above could look like:
>
> Index: tests/test-argp-2.sh
> ===================================================================
> RCS file: /cvsroot/gnulib/gnulib/tests/test-argp-2.sh,v
> retrieving revision 1.1
> diff -u -r1.1 test-argp-2.sh
> --- tests/test-argp-2.sh 21 Jan 2006 19:09:06 -0000 1.1
> +++ tests/test-argp-2.sh 8 Nov 2006 22:39:43 -0000
> @@ -24,7 +24,9 @@
>
> func_compare() {
> # If argp was compiled without base_name, it will display full program name
> - sed '1{s,: [^ ]*/test-argp,: test-argp,;}' | cmp - $TMP
> + sed '1{
> + s,: [^ ]*/test-argp,: test-argp,
> + }' | cmp - $TMP
> }
>
> ####
> @@ -70,9 +72,9 @@
> one one unit
> two two units
>
> - -?, --help Give this help list
> - --usage Give a short usage message
> - -V, --version Print program version
> + -?, --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.
>
>
