[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-781-gfeed175

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=feed175be52b073541b607f07059b4ea17a6abcd

The branch, master has been updated
       via  feed175be52b073541b607f07059b4ea17a6abcd (commit)
       via  12f48fafa9643fd497c958545f2990d2bfc6abb1 (commit)
      from  b90c228f7227598bc5b5c5dedc4154189faa9150 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit feed175be52b073541b607f07059b4ea17a6abcd
Merge: b90c228 12f48fa
Author: Stefano Lattarini <address@hidden>
Date:   Tue Apr 19 09:46:53 2011 +0200

    Merge branch 'am-tests-environment'

commit 12f48fafa9643fd497c958545f2990d2bfc6abb1
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 18 00:52:03 2011 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   17 ++++++++
 doc/automake.texi                                  |   42 ++++++++++----------
 lib/Automake/tests/Makefile.in                     |   10 ++--
 lib/am/check.am                                    |   10 ++--
 tests/Makefile.am                                  |    2 +-
 tests/Makefile.in                                  |   12 +++---
 ...st => parallel-tests-am_tests_environment.test} |    6 +-
 7 files changed, 58 insertions(+), 41 deletions(-)
 rename tests/{parallel-tests-am_tests_setup.test => 
parallel-tests-am_tests_environment.test} (91%)

diff --git a/ChangeLog b/ChangeLog
index 7e97a4a..a84daca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-04-18  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        test defs: allow overriding of `$me'
diff --git a/doc/automake.texi b/doc/automake.texi
index 4f971d2..5dd1099 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8706,7 +8706,7 @@ for exceptional failures.  Similar to the simple test 
driver,
 the @code{check_*} variables are honored, and the environment variable
 @env{srcdir} is set during test execution. Also, @code{TESTS_ENVIRONMENT}
 is still honored, but is complemented by a new developer-reserved variable
address@hidden (described below).
address@hidden (described below).
 
 This test driver is still experimental and may undergo changes in order
 to satisfy additional portability requirements.
@@ -8778,27 +8778,27 @@ and @samp{./wrapper-script -d baz} to produce 
@file{foo.log},
 @samp{TESTS_ENVIRONMENT} variable is still expanded before the driver,
 but should be reserved for the user.
 
address@hidden AM_TESTS_SETUP
-The @code{AM_TESTS_SETUP} variable can be used to run initialization code
-and set environment variables for the tests' runs.  The user can still
-employ the @code{TESTS_ENVIRONMENT} variable to override settings from
address@hidden  Note that, for implementation reasons, if the
address@hidden variable is set, its contents @emph{must} be
-terminated by a semicolon.
-
address@hidden
-# The tests below are expected to use the file descriptor passed
-# in the environment variable 'warn_fileno' to print warnings
-# (e.g., about skipped and failed tests).  If this variable were
-# to be set to `2' (i.e. default stderr), the warnings would be
-# redirected by the automake parallel-tests driver into the .log
-# files.  But the AM_TESTS_SETUP definition below will cause the
-# reasons for skip/failure to be printed to the console instead.
-# The user can still override this by setting TESTS_ENVIRONMENT
-# to e.g. `warn_fileno=2' at make runtime, which will cause the
-# warnings to be sent to the .log files again.
address@hidden AM_TESTS_ENVIRONMENT
+The @code{AM_TESTS_ENVIRONMENT} variable can be used to run initialization
+code and set environment variables for the tests' runs.  The user can
+still employ the @code{TESTS_ENVIRONMENT} variable to override settings
+from @code{AM_TESTS_ENVIRONMENT}.  Note that, for implementation reasons,
+if the @code{AM_TESTS_ENVIRONMENT} variable is set, its contents
address@hidden be terminated by a semicolon.
+
address@hidden
+# The tests below are expected to use the file descriptor passed in
+# the environment variable 'warn_fileno' to print warnings (e.g.,
+# about skipped and failed tests).  If this variable were to be set
+# to `2' (i.e. default stderr), the warnings would be redirected by
+# the automake parallel-tests driver into the .log files.  But the
+# AM_TESTS_ENVIRONMENT definition below will cause the reasons for
+# skip/failure to be printed to the console instead.  The user
+# can still override this by setting TESTS_ENVIRONMENT to e.g.
+# `warn_fileno=2' at make runtime, which will cause the warnings
+# to be sent to the .log files again.
 TESTS = test1.sh test2.sh ...
-AM_TESTS_SETUP = exec 9>&2; warn_fileno=9; export warn_fileno;
+AM_TESTS_ENVIRONMENT = exec 9>&2; warn_fileno=9; export warn_fileno;
 @end example
 
 @trindex mostlyclean
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index c0abba1..4eb7c6a 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -128,10 +128,10 @@ am__sh_e_setup = case $$- in *e*) set +e;; esac
 # To be inserted before the command running the test.  Creates the
 # directory for the log if needed.  Stores in $dir the directory
 # containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_SETUP (if any), and passes
-# TESTS_ENVIRONMENT.  Saves and restores TERM around uses of
-# TESTS_ENVIRONMENT and AM_TESTS_SETUP, in case any of them unsets
-# it.
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Saves and restores TERM around uses of
+# TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT, in case any of them
+# unsets it.
 am__check_pre = \
 $(am__sh_e_setup);                                     \
 $(am__vpath_adj_setup) $(am__vpath_adj)                        \
@@ -146,7 +146,7 @@ if test -f "./$$f"; then dir=./;                    \
 elif test -f "$$f"; then dir=;                         \
 else dir="$(srcdir)/"; fi;                             \
 tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;           \
-$(AM_TESTS_SETUP)                                      \
+$(AM_TESTS_ENVIRONMENT)                                        \
 $(TESTS_ENVIRONMENT)
 # To be appended to the command running the test.  Handle the stdout
 # and stderr redirection, and catch the exit status.
diff --git a/lib/am/check.am b/lib/am/check.am
index 1827e01..97ecb68 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -94,10 +94,10 @@ am__sh_e_setup = case $$- in *e*) set +e;; esac
 # To be inserted before the command running the test.  Creates the
 # directory for the log if needed.  Stores in $dir the directory
 # containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_SETUP (if any), and passes
-# TESTS_ENVIRONMENT.  Saves and restores TERM around uses of
-# TESTS_ENVIRONMENT and AM_TESTS_SETUP, in case any of them unsets
-# it.
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Saves and restores TERM around uses of
+# TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT, in case any of them
+# unsets it.
 am__check_pre =                                                \
 $(am__sh_e_setup);                                     \
 $(am__vpath_adj_setup) $(am__vpath_adj)                        \
@@ -112,7 +112,7 @@ if test -f "./$$f"; then dir=./;                    \
 elif test -f "$$f"; then dir=;                         \
 else dir="$(srcdir)/"; fi;                             \
 tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;           \
-$(AM_TESTS_SETUP)                                      \
+$(AM_TESTS_ENVIRONMENT)                                        \
 $(TESTS_ENVIRONMENT)
 
 # To be appended to the command running the test.  Handle the stdout
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 09791be..d5a980a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -701,7 +701,7 @@ 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 \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 13c03b0..794a7b7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -133,10 +133,10 @@ am__sh_e_setup = case $$- in *e*) set +e;; esac
 # To be inserted before the command running the test.  Creates the
 # directory for the log if needed.  Stores in $dir the directory
 # containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_SETUP (if any), and passes
-# TESTS_ENVIRONMENT.  Saves and restores TERM around uses of
-# TESTS_ENVIRONMENT and AM_TESTS_SETUP, in case any of them unsets
-# it.
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Saves and restores TERM around uses of
+# TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT, in case any of them
+# unsets it.
 am__check_pre = \
 $(am__sh_e_setup);                                     \
 $(am__vpath_adj_setup) $(am__vpath_adj)                        \
@@ -151,7 +151,7 @@ if test -f "./$$f"; then dir=./;                    \
 elif test -f "$$f"; then dir=;                         \
 else dir="$(srcdir)/"; fi;                             \
 tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;           \
-$(AM_TESTS_SETUP)                                      \
+$(AM_TESTS_ENVIRONMENT)                                        \
 $(TESTS_ENVIRONMENT)
 # To be appended to the command running the test.  Handle the stdout
 # and stderr redirection, and catch the exit status.
@@ -965,7 +965,7 @@ 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 \
diff --git a/tests/parallel-tests-am_tests_setup.test 
b/tests/parallel-tests-am_tests_environment.test
similarity index 91%
rename from tests/parallel-tests-am_tests_setup.test
rename to tests/parallel-tests-am_tests_environment.test
index bf0d0c6..072e614 100755
--- a/tests/parallel-tests-am_tests_setup.test
+++ b/tests/parallel-tests-am_tests_environment.test
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# parallel-tests: check AM_TESTS_SETUP support, and its interaction
-# with TESTS_ENVIRONMENT.
+# parallel-tests: check AM_TESTS_ENVIRONMENT support, and its
+# interactions with TESTS_ENVIRONMENT.
 
 parallel_tests=yes
 . ./defs || Exit 1
@@ -31,7 +31,7 @@ cat > Makefile.am << 'END'
 TEST_EXTENSIONS = .sh .test
 TESTS = foo.test bar.sh
 SH_LOG_COMPILER = sh
-AM_TESTS_SETUP = $(MKDIR_P) quux.dir; exec 9>&2; fd=9; export fd;
+AM_TESTS_ENVIRONMENT = $(MKDIR_P) quux.dir; exec 9>&2; fd=9; export fd;
 EXTRA_DIST = $(TESTS)
 END
 


hooks/post-receive
-- 
GNU Automake