Re: [PATCH] Modernize, improve and extend tests `subobj*.test'.

[Ralf Wildenhues]

* Stefano Lattarini wrote on Wed, Jul 14, 2010 at 03:41:14PM CEST:
> * tests/subobjname.test:  Add trailing `:' command.
> * tests/subobj.test: Make grepping of `Makefile.in' stricter.
> Escape literal dots in grep regexps.
> * tests/subobj2.test:  Add trailing `:' command.  Do not use the
> unportable fgrep option `-e'.  Make grepping of `Makefile.in'
> stricter.
> * tests/subobj3.test: Add trailing `:' command.
> (configure.in): Use proper m4 quoting, and avoid obsolescent
> constructs.
> * tests/subobj8.test: Likewise.  Also, enable `errexit' shell
> flag, with related changes
> * tests/subobj4.test: Likewise.  Also, make grepping of
> `Makefile.in' stricter.
> * tests/subobj5.test: Add trailing `:' command.  Move setting of
> `errexit' shell flag earlier in the script (just after inclusion
> of ./defs).
> (configure.in): Use the stub created by `./defs', rather than
> writing it from scratch, and avoid obsolescent constructs.
> * tests/subobj6.test: Add trailing `:' command.  Move setting of
> `errexit' shell flag earlier in the script (just after inclusion
> of ./defs).  Do not create useless dummy ac-init file `f'.
> * tests/subobj7.test: Do not create useless dummy ac-init file
> `f'.  Prefer fgrep over grep.
> (configure.in): Use the stub created by `./defs', rather than
> writing it from scratch, and avoid obsolescent constructs.
> * tests/subobj9.test: Move setting of `errexit' shell flag earlier
> in the script (just after inclusion of ./defs).  Fail the test if
> `make distcheck' fails.  Ensure verbose printing of captured make
> stdout.
> (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
> (Makefile.am): Explicitly mark target "print" as phony.
> * tests/subobj10.test: Removed duplicated call to `set -e'.  Add
> trailing `:' command.
> (configure.in): Normalize the call to AC_INIT w.r.t. other tests.

OK for maint with nits below addressed, thanks!
Ralf

> --- a/tests/subobj2.test
> +++ b/tests/subobj2.test
> @@ -1,5 +1,5 @@
>  #! /bin/sh
> -# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
> +# Copyright (C) 1999, 2001, 2002, 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
> @@ -33,6 +33,8 @@ END
>  $ACLOCAL
>  $AUTOMAKE
>  
> -$FGREP 'generic/a.$(OBJEXT)' Makefile.in
> +grep '^generic/a\.\$(OBJEXT):' Makefile.in

Some day I'll add initial and trailing space to the target names of all
generated rules to see how portable our test suite is ... ;-)

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

> @@ -37,6 +35,6 @@ END
>  $ACLOCAL
>  $AUTOMAKE --add-missing
>  
> -grep wish_CFLAGS Makefile.in && Exit 1
> +$FGREP wish_CFLAGS Makefile.in && Exit 1

Tsk.

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

> @@ -33,12 +36,14 @@ cat > Makefile.am << 'END'
>  SUBDIRS = foo
>  END
>  
> -cat > foo/Makefile.am << 'EOF'
> +cat > foo/Makefile.am << 'END'
>  AUTOMAKE_OPTIONS = subdir-objects
>  bin_PROGRAMS = mumble
>  mumble_SOURCES = bar/a.c
> -EOF
> +END

Another one of those needless changes.

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

> @@ -65,17 +64,19 @@ $AUTOMAKE -a

> -$MAKE distcheck 2>&1 | tee out
> +$MAKE distcheck >out 2>&1 || { cat out; Exit 1; }
> +cat out

s/out/output/g  ?