Re: [PATCH] Minor improvements for tests `acloca*.test'.

[Ralf Wildenhues]

* Stefano Lattarini wrote on Sun, Jun 27, 2010 at 04:48:03PM CEST:
> Another testsuite-tweaking patch.  This time, the changes should be 
> small and simple.

> Minor improvements for tests `acloca*.test'.

This is not ok.  Let's just drop everything from it except for the
changes I've copied below.  Thanks.

> --- a/tests/acloca19.test
> +++ b/tests/acloca19.test
> @@ -1,5 +1,5 @@
>  #! /bin/sh
> -# Copyright (C) 2005  Free Software Foundation, Inc.
> +# Copyright (C) 2005, 2010 Free Software Foundation, Inc.
>  #
>  # 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
> @@ -41,9 +41,11 @@ END
>  
>  $ACLOCAL
>  $AUTOCONF
> -./configure >stdout
> +./configure >stdout || { cat stdout; Exit 1; }
>  cat stdout

> --- a/tests/aclocal.test
> +++ b/tests/aclocal.test
> @@ -27,18 +27,20 @@ test -f fred
>  $ACLOCAL --output 2>stderr && { cat stderr >&2; Exit 1; }
>  cat stderr >&2
>  grep 'option.*--output.*an argument' stderr
> -grep help stderr
> +grep '[Tt]ry.*--help.*for more information$' stderr

Please don't match end of line.  Two more instances below.

>  $ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; Exit 1; }
>  cat stderr >&2
>  grep 'unrecognized.*--unknown-option' stderr
> -grep help stderr
> +grep '[Tt]ry.*--help.*for more information$' stderr
>  
>  $ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
>  cat stderr >&2
>  grep 'unrecognized.*--ver' stderr
> -grep help stderr
> +grep '[Tt]ry.*--help.*for more information$' stderr


> --- a/tests/aclocal5.test
> +++ b/tests/aclocal5.test
> @@ -1,5 +1,5 @@
>  #! /bin/sh
> -# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
> +# Copyright (C) 2003, 2004, 2005, 2010 Free Software Foundation, Inc.
>  #
>  # 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
> @@ -55,16 +55,18 @@ echo 'AU_ALIAS([AM_TEST], [AC_SUBST])' > m4/moredefs.m4

>  # Make sure configure dependencies are distributed.
>  $MAKE distdir
> -test -f aclocal5-1.0/m4/moredefs.m4
> +test -f $me-1.0/m4/moredefs.m4

> --- a/tests/aclocal6.test
> +++ b/tests/aclocal6.test

>  # Make sure configure dependencies are distributed.
>  $MAKE distdir
> -test -f aclocal6-1.0/m4/moredefs.m4
> -test -f aclocal6-1.0/m4/somedefs.m4
> -test -f aclocal6-1.0/acinclude.m4
> +test -f $me-1.0/m4/moredefs.m4
> +test -f $me-1.0/m4/somedefs.m4
> +test -f $me-1.0/acinclude.m4


> diff --git a/tests/aclocal8.test b/tests/aclocal8.test
> index ac10aff..acc694e 100755
> --- a/tests/aclocal8.test
> +++ b/tests/aclocal8.test

>  
> -$ACLOCAL -I m4 >output 2>&1
> +$ACLOCAL -I m4 >output 2>&1 || { cat output; Exit 1; }
>  cat output

Cheers,
Ralf