From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 19 Apr 2011 07:46:53 +0000 (+0200)
Subject: Merge branch 'am-tests-environment'
X-Git-Tag: v1.11b~367
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=feed175be52b073541b607f07059b4ea17a6abcd;p=platform%2Fupstream%2Fautomake.git

Merge branch 'am-tests-environment'
---

feed175be52b073541b607f07059b4ea17a6abcd
diff --cc ChangeLog
index 7e97a4a,f121e0e..a84daca
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,22 +1,35 @@@
+ 2011-04-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	check: rename AM_TESTS_SETUP -> AM_TESTS_ENVIRONMENT
+ 	The AM_TESTS_SETUP naming was not a good one after all.  It may
+ 	be technically more correct than AM_TESTS_ENVIRONMENT, but the
+ 	latter is a better one simply because it is easier to remember,
+ 	and even if you've never heard of it and only know the semantics
+ 	of TESTS_ENVIRONMENT, you can have a straightforward way to
+ 	figure out how AM_TESTS_ENVIRONMENT would work.
+ 	* tests/check.am (am__check_pre): Update.
+ 	* doc/automake.in (Simple Tests using parallel-tests): Update.
+ 	* tests/parallel-tests-am_tests_setup.test: Renamed ...
+ 	* tests/parallel-tests-am_tests_environment.test: ... to this,
+ 	and updated.
+ 	* tests/Makefile.am (TESTS): Update.
+ 	Suggestion and motivation by Ralf Wildenhues.
+ 
  2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +	test defs: allow overriding of `$me'
 +	* tests/defs.in ($me): Allow overriding by the including test
 +	script.  Add some explicative comments.
 +
 +2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	coverage: more tests on the parallel-tests driver
 +	* tests/parallel-tests-interrupt.test: New test.
 +	* tests/parallel-tests-reset-term.test: Likewise.
 +	* tests/Makefile.am (TESTS): Update.
 +
 +2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
  	check: new developer-reserved AM_TESTS_SETUP variable
  	For reference, see the discussion at:
  	<http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00213.html>
diff --cc tests/Makefile.am
index 09791be,3c98cfc..d5a980a
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -701,11 -580,9 +701,11 @@@ parallel-tests7.test 
  parallel-tests8.test \
  parallel-tests9.test \
  parallel-tests10.test \
- parallel-tests-am_tests_setup.test \
+ parallel-tests-am_tests_environment.test \
  parallel-tests-unreadable-log.test \
  parallel-tests-subdir.test \
 +parallel-tests-interrupt.test \
 +parallel-tests-reset-term.test \
  parse.test \
  percent.test \
  percent2.test \
diff --cc tests/Makefile.in
index 13c03b0,36a63ce..794a7b7
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -965,11 -853,9 +965,11 @@@ parallel-tests7.test 
  parallel-tests8.test \
  parallel-tests9.test \
  parallel-tests10.test \
- parallel-tests-am_tests_setup.test \
+ parallel-tests-am_tests_environment.test \
  parallel-tests-unreadable-log.test \
  parallel-tests-subdir.test \
 +parallel-tests-interrupt.test \
 +parallel-tests-reset-term.test \
  parse.test \
  percent.test \
  percent2.test \