From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 2 Dec 2010 12:25:10 +0000 (+0100)
Subject: Merge branch 'tests-set-e-enable-2'
X-Git-Tag: ng-0.5a~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edf8133ce62cb049789e34e1eeb611052fb409ec;p=thirdparty%2Fautomake.git

Merge branch 'tests-set-e-enable-2'
---

edf8133ce62cb049789e34e1eeb611052fb409ec
diff --cc ChangeLog
index 33694aaf2,c32c2e14c..0e04147db
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,53 +1,78 @@@
+ 2010-12-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Enable `set -e' in more tests (plus some tweakings).
+ 	* tests/mkinstall.test: Enable `errexit' shell flag, and related
+ 	changes.  Add a trailing `:' command, if needed.
+ 	* tests/mdate2.test: Likewise.
+ 	* tests/objc.test: Likewise.
+ 	* tests/noinst.test: Likewise.
+ 	* tests/outdir.test: Likewise.
+ 	* tests/number.test: Likewise.
+ 	* tests/pluseq.test: Likewise.
+ 	* tests/req.test: Likewise.
+ 	* tests/rulepat.test: Likewise.
+ 	* tests/specflg6.test: Likewise.
+ 	* tests/spell3.test: Likewise.
+ 	* tests/parse.test: Likewise, and ...
+ 	(configure.in): Use the stub created by ./defs, rather than
+ 	writing it from scratch.  Remove useless calls to AC_PROG_RANLIB
+ 	and AC_OUTPUT.
+ 	* tests/mdate4.test: Likewise.
+ 	* tests/mkinstall.test: Likewise, and ...
+ 	(configure.in): ... drop useless call to `AC_OUTPUT'.
+ 	* tests/output.test: Enable `errexit' shell flag, and related
+ 	changes.  Add a trailing `:' command.
+ 	(configure.in): Modernize.
+ 	* tests/output2.test: Likewise.
+ 	* tests/output3.test: Likewise.
+ 	* tests/output4.test: Likewise.
+ 	* tests/mdate3.test: Enable `errexit' shell flag, and related
+ 	changes.  Prefer `$me' over hard-coded test name.  Do not move
+ 	non-existent or useless files in the build auxiliary directory.
+ 	* tests/nodistdir.test: Enable `errexit' shell flag, and related
+ 	changes.  Prefer trailing `:' over trailing `Exit 0'.
+ 	* tests/nodist.test: Likewise.  Also, prefer cat + here-doc over
+ 	echo to create input test files, and do not create useless dummy
+ 	C source files.
+ 	* tests/nodist2.test: Likewise.
+ 	* tests/ppf77.test: Enable `errexit' shell flag, with related
+ 	changes.  Add a trailing `:' command.  Do not create useless
+ 	dummy source files.
+ 	* tests/spelling.test: Enable `errexit' shell flag, with related
+ 	changes.  Add a trailing `:' command.  Also, grep Automake error
+ 	message.
+ 	* tests/specflg3.test: Enable `errexit' shell flag, with related
+ 	changes.  Avoid unportable use of `-e' option of fgrep.  Prefer
+ 	trailing `:' over trailing `Exit 0'.  Remove extra empty lines,
+ 	and cosmetic changes to whitespaces.
+ 	* tests/obsolete.test: Enable `errexit' shell flag, with related
+ 	changes.  Improve verbosity.  Other miscellanous changes.
+ 
 +2010-11-30  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Improve and extend tests on `:=' variable assignments.
 +	* tests/colneq.test: Avoid redundant use of variable assignments
 +	in Makefile.am.  Use command-line automake options instead of
 +	editing AUTOMAKE_OPTIONS in Makefile.am.  Make grepping of the
 +	generated Makefile.in slightly stricter.  Add a trailing `:'
 +	command.
 +	* tests/colneq2.test: Do not create unneeded dummy files.  Run
 +	also autoconf, ./configure and make.  Add trailing `:' command.
 +	* tests/colneq3.test: New test, similar to colneq.test, but
 +	running also autoconf, ./configure and make.
 +	* tests/Makefile.am (TESTS): Update.
 +
 +2010-11-26  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Remove long-deprecated options --Werror and --Wno-error.
 +	These options has been deprecated at least since commit
 +	"Release-1-6-1b-35-gc037f20", dated 2002-07-06.
 +	* automake.in (parse_arguments): Do not recognize anymore options
 +	`--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
 +	and `-Wno-error'.
 +	* tests/werror.test: Update: use `-Werror' instead of `--Werror'.
 +	* NEWS: Update.
 +
  2010-11-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	Fix spurious failures in `silent*.test' for $CC != gcc
diff --cc tests/obsolete.test
index 588fc0d8e,6c969dc4b..2c43e7a96
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@@ -28,21 -30,28 +30,28 @@@ AC_INI
  END
  
  $PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
 -    "$testsrcdir/../m4/obsolete.m4" >> obs
 +    "$top_testsrcdir/m4/obsolete.m4" >> obs
  cat obs >> configure.in
- $PERL -ne 'chomp; print "grep $_ stderr || Exit 1\n"; ' obs > obs.1
+ $PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1
  $PERL -ne 'chomp; print "grep $_ configure.in && Exit 1\n"; ' obs > obs.2
+ echo : >> obs.1 # since it will be sourced, it must and with a success
+ echo : >> obs.2 # ditto
+ 
+ cat configure.in # for debugging
+ cat obs.1        # ditto
+ cat obs.2        # ditto
  
  # Sanity check.  Make sure we have added something to configure.in.
- test `cat configure.in | wc -l` -gt 1 || Exit 1
+ test `wc -l <configure.in` -gt 1
  
- $ACLOCAL || Exit 1
+ $ACLOCAL
  
  # Expect Autoconf to complain about each of the macros in obs.
- $AUTOCONF -Wobsolete >stderr 2>&1
+ $AUTOCONF -Wobsolete >output 2>&1 || { cat output; Exit 1; }
+ cat output
  . ./obs.1
  # Make sure Autoupdate remove each of these macros.
- $AUTOUPDATE || Exit 1
+ $AUTOUPDATE
  . ./obs.2
  
  # Autoconf should be able to grok the updated configure.in.