From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 9 Jun 2010 20:54:35 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~575
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34605b4dc68eb874a088f094f58f1e4d7c18820b;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'
---

34605b4dc68eb874a088f094f58f1e4d7c18820b
diff --cc ChangeLog
index f8e3b58,28786b0..8f33b63
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,44 +1,57 @@@
+ 2010-06-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Modernize, improve and/or fix various test scripts.
+ 	* tests/sanity.test: Rely on the `configure.in' stub created by
+ 	`./defs', rather than writing one from scratch.
+ 	* tests/depend2.test: Likewise.  Also, call `set -e' just after
+ 	the inclusion of `./defs', instead that later in the script.
+ 	* tests/canon5.test: Avoid a useless `|| Exit 1' after a call to
+ 	$AUTOMAKE, and improve the positioning of an $ACLOCAL call.
+ 	* tests/exeext4.test: Use $FGREP instead of grep, where possible.
+ 	Make auxiliary rules in the generated Makefile more silent.
+ 	These changes make some checks slighty stricter.
+ 	* tests/ext2.test: Call `Exit 1' if inclusion of `./defs' fails.
+ 	* tests/gettext2.test: Place final `:' at the end of the script,
+ 	rather than in the middle.
+ 	* tests/exeext.test: Call `set -e' just after the inclusion of
+ 	`./defs', instead that later in the script.
+ 	* tests/extra5.test: Likewise.
+ 	* tests/confdeps.test: Likewise.  Also, prefer `mv -f' over
+ 	plain `mv', just to be sure.
+ 	* tests/depcomp.test: Enable `errexit' shell flag, with related
+ 	changes.  Also, modernize the generated configure.in.
+ 	* tests/cond9.test: Likewise.  Also, rely on the `configure.in'
+ 	stub created by `./defs', rather than writing one from scratch.
+ 	* tests/cond10.test: Likewise.
+ 	* tests/depcomp2.test: Likewise.
+ 	* tests/depend3.test: Likewise.
+ 	* tests/distcom7.test: Likewise.
+ 	* tests/fortdep.test: Likewise.  Also, remove definition of
+ 	AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am,
+ 	since that flag is already provided by $AUTOMAKE.
+ 	* tests/mdate.test: Made stricter, by checking that Automake
+ 	actually failed, and by	making a stricter grep on the error
+ 	message.  Also, set shell `errexit flag'.
+ 	* tests/python2.test: Improved verbose messages.
+ 
+ 	Make test `ammissing.test' stricter.
+ 	* tests/ammissing.test: Fail if $ACLOCAL succeds unexpectedly.
+ 	Enable `errexit' shell flag.
+ 
  2010-06-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	Fix error in generation of parallel tests.
 +	* tests/defs.in ($am_skip_defs): New variable, to be used when
 +	./defs must be sourced multiple times.  If set, unset it and
 +	only define $srcdir; otherwise, also go through the rest of
 +	the script.
 +	($am_defs_included): Remove, no more needed.
 +	* tests/Makefile.am ($(parallel_tests)): Update accordingly,
 +	using only $srcdir from defs.
 +	Fixes potential test failures of tests that use $required.
 +
 +2010-06-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	Enable `errexit' shell flag in some test scripts.
  	* tests/subcond.test: Enabled `errexit' shell flag, and related
diff --cc tests/confdeps.test
index f706e8c,8e1cc64..60e7136
--- a/tests/confdeps.test
+++ b/tests/confdeps.test
@@@ -18,11 -18,13 +18,13 @@@
  
  . ./defs || Exit 1
  
- echo "FOO = foo"        > Makefile.am
  set -e
  
- echo "$me: Generated by aclocal ..."
+ echo "FOO = foo" > Makefile.am
+ 
  $ACLOCAL
+ 
 -echo "$me: Generated by aclocal..."
++echo "$me: Generated by aclocal ..."
  $AUTOMAKE
  grep '^\$(ACLOCAL_M4):' Makefile.in