From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 12 Jun 2010 12:21:40 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~571
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5a44609007206e061a2336f23f2b0c028466363;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'
---

b5a44609007206e061a2336f23f2b0c028466363
diff --cc ChangeLog
index 8f3dbea,38c8948..c4e69a5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,62 +1,69 @@@
+ 2010-06-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Remove a couple of unneeded conditionals from tests.
+ 	* tests/pr243.test, tests/pr266.test, tests/strip.test: No need
+ 	for the FOOTEST conditional.
+ 
+ 2010-06-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Modernize, improve and/or fix various test scripts.
+ 	* tests/symlink3.test: Deleted, separated into two new, more
+ 	complete tests ...
+ 	* tests/forcemiss.test: ... this one ...
+ 	* tests/forcemiss2.test: ... and this one.
+ 	* tests/symlink2.test: Enable `errexit' shell flag, make test
+ 	stricter, and skip it if symlink creation is not supported.
+ 	* tests/postproc.test: Enable `errexit' shell flag, related
+ 	changes, and a couple of unrelated cosmetic changes.
+ 	* tests/recurs.test: Use the `configure.in' stub created by
+ 	`./defs', rather than writing one from scratch.  Make grepping
+ 	of Automake stderr slighty stricter.
+ 	* tests/substtarg.test: Likewise.
+ 	* tests/strip.test: Likewise, and move the call to `set -e'
+ 	earlier (just after the inclusion of `./defs').	Also, make sure
+ 	that the script installed by `make install-script' is equal to
+ 	the original one.
+ 	* tests/substref.test: Use the `configure.in' stub created by
+ 	`./defs', rather than writing one from scratch.  Move the call
+ 	to `set -e' earlier (just after the inclusion of `./defs').
+ 	Avoid to explicitly export CC for configure (that's already done
+ 	in ./defs).  Avoid potential problems with unpredictable make
+ 	output.  Finally, make grepping of Makefile.in stricter.
+ 	* tests/substre2.test: Ensure verbose printing of the captured
+ 	make's output, and make its grepping slighty stricter.
+ 	* tests/cygwin32.test: Enable `errexit' shell flag, and related
+ 	changes.  Also, do not create useless dummy source/data files.
+ 	* tests/scripts.test: Likewise.
+ 	* tests/recurs2.test: Likewise.  Also, use the `configure.in'
+ 	stub created by `./defs'.
+ 	* tests/Makefile.am (TESTS): Updated.
+ 
+ 	Modernize, improve and/or fix tests `pluseq*.test.
+ 	* tests/pluseq5.test: Append to configure.in using cat with an
+ 	here-doc, not using echo.
+ 	* tests/pluseq10.test: Make sure that the captured output of
+ 	`make' command is always displayed. Where possible, use $FGREP
+ 	instead of grep (this change makes some checks slighty stricter).
+ 	* tests/pluseq8.test: Enable `errexit' shell flag, with related
+ 	changes.
+ 	* tests/pluseq.test: Likewise.  Also, do not create useless dummy
+ 	data files, and use better m4 quoting in generated configure.in.
+ 	* tests/pluseq2.test: Likewise.  Also, append to configure.in
+ 	using cat with an here-doc, not using echo.
+ 	* tests/pluseq3.test: Likewise.
+ 	* tests/pluseq4.test: Likewise.
+ 	* tests/pluseq6.test: Likewise.
+ 	* tests/pluseq7.test: Do not create useless dummy source file.
+ 	* tests/pluseq9.test: Slighty extended w.r.t. the grepping of
+ 	Automake stderr.  Some unrelated cosmetic changes.
+ 
 +2010-06-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	cscope.test: ensure verbose printing of captured stderr.
 +	* tests/cscope.test: Print captured stderr before failing.
 +
 +2010-06-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
  	Testsuite: ensure verbose printing of captured stderr.
  	* tests/acloca18.test: Print captured stderr before either failing
  	or grepping it.  Be sure to send captured stderr to stderr, not to
diff --cc tests/Makefile.am
index 671df0c,70058a1..7875fc5
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -716,10 -690,8 +718,9 @@@ suffix12.test 
  suffix13.test \
  symlink.test \
  symlink2.test \
- symlink3.test \
  syntax.test \
  tags.test \
 +tags2.test \
  tagsub.test \
  tar.test \
  tar2.test \
diff --cc tests/Makefile.in
index 670867c,849dc8f..07f27ed
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -929,10 -928,8 +931,9 @@@ suffix12.test 
  suffix13.test \
  symlink.test \
  symlink2.test \
- symlink3.test \
  syntax.test \
  tags.test \
 +tags2.test \
  tagsub.test \
  tar.test \
  tar2.test \