[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-995-g9a6e17a

[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=9a6e17a607c757c323050effe77632a5edd9ac09

The branch, testsuite-work has been updated
       via  9a6e17a607c757c323050effe77632a5edd9ac09 (commit)
       via  cd8f7420f78b3d9a9005cd425f6f27545d0f7aaa (commit)
       via  e7a6300b022c251e067dd75229d5c02b658c49d2 (commit)
       via  47f596af02a6229dbc87ec1e3317a7a471e0a160 (commit)
       via  3e334a272fa601bebb5896e25cfb63f34822a275 (commit)
       via  69bb25618c4f3a14e5b405822d726620e955b07b (commit)
      from  6623ea6120320829ba8eb40dd08535f89ef47793 (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 9a6e17a607c757c323050effe77632a5edd9ac09
Merge: 6623ea6 cd8f742
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 30 17:23:58 2011 +0200

    Merge branch 'master' into testsuite-work
    
    * master:
      cosmetics: fix typos in recent ChangeLog entries
      docs: explain why AM_TESTS_ENVIRONMENT must be semicolon-terminated
      docs: fix unportable example of AM_TESTS_ENVIRONMENT usage

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

Summary of changes:
 ChangeLog         |   25 +++++++++++++++++++++----
 doc/automake.texi |   34 +++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 525654b..5303dbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,28 @@
-2011-06-23   Stefano Lattarini  <address@hidden>
+2011-06-29   Stefano Lattarini  <address@hidden>
+
+       docs: explain why AM_TESTS_ENVIRONMENT must be semicolon-terminated
+       * doc/automake.texi (Simple Tests using parallel-tests): Ditto, and
+       related adjustments.
+       Suggestion by Ralf Wildenhues.
+
+2011-06-29  Stefano Lattarini  <address@hidden>
+
+       docs: fix unportable example of AM_TESTS_ENVIRONMENT usage
+       * doc/automake.texi (Simple Tests using parallel-tests): The
+       old example on AM_TESTS_ENVIRONMENT relied on unportable shell
+       features, and in particular didn't work with various Korn
+       Shells (see also commit `v1.11-925-g29ca903').  Give another
+       example, simpler this time, but still inspired to real-world
+       usage (the GNU coreutils testsuite).
+
+2011-06-23  Stefano Lattarini  <address@hidden>
 
        docs: avoid a footnote, some related rewordings and improvements
        * doc/automake.texi (Dist): Reword the part about automatically
        distributed files to avoid a footnote.  Since we are at it, extend
        a bit, and add an example and a reference to a relevant test case.
 
-2011-06-23   Stefano Lattarini  <address@hidden>
+2011-06-23  Stefano Lattarini  <address@hidden>
 
        docs: minor cosmetic fixes
        * doc/automake.texi: Break few overly long lines, throughout the
@@ -18,7 +35,7 @@
        ("Other things Automake recognizes" @item AM_C_PROTOTYPES): Use
        @pxref instead of @ref.
 
-2011-06-23   Stefano Lattarini  <address@hidden>
+2011-06-23  Stefano Lattarini  <address@hidden>
 
        help: improve text about automatically-distributed files
        This change fixes automake bug#7819.
@@ -31,7 +48,7 @@
        * tests/autodist.test: Likewise.
        (configure.in): Remove useless call to AM_MAINTAINER_MODE.
 
-2011-06-23   Stefano Lattarini  <address@hidden>
+2011-06-23  Stefano Lattarini  <address@hidden>
 
        refactor: split 'usage' subroutine in automake
        This change is related to automake bug#7819.
diff --git a/doc/automake.texi b/doc/automake.texi
index 9f40855..72f0eb3 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8807,23 +8807,23 @@ but should be reserved for the user.
 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_ENVIRONMENT = exec 9>&2; warn_fileno=9; export warn_fileno;
+from @code{AM_TESTS_ENVIRONMENT}; for that to work portably, however,
+the contents of a non-empty @code{AM_TESTS_ENVIRONMENT} @emph{must} be
+terminated by a semicolon.  Here is an example of a slightly elaborate
+definition:
+
address@hidden
+AM_TESTS_ENVIRONMENT = \
+## Some environment initializations are kept in a separate shell file
+## `tests-env.sh', which can make it easier to also run tests from the
+## command line.
+  . $(srcdir)/tests-env.sh; \
+## On Solaris, prefer more POSIX-compliant versions of the standard tools
+## by default.
+  if test -d /usr/xpg4/bin; then \
+    PATH=/usr/xpg4/bin:$$PATH; export PATH; \
+  fi;
address@hidden $$ restore font-lock
 @end example
 
 @trindex mostlyclean


hooks/post-receive
-- 
GNU Automake