From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 30 Apr 2013 15:36:41 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e402b325d6d5a58c67a794f9406008ae620a8c1e;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  sync: update files from upstream with "make fetch"
  maintcheck: remove outdated whitelisting
  tar: format 'ustar' cannot support UID/GID longer than 21 bits
  docs: issues with configure substitutions in TESTS
  tests: avoid possible autotools caching issues (automake bug#13832)
  tests: rename some with more descriptive names
  docs: add myself and Ralf Wildenhues as authors
  authors: add myself
  dry-run: don't get confused by '-I' option
  tests: avoid a spurious failure with the Korn Shell
  dry-run: with GNU make, prefer $(MFLAGS) over $(MAKEFLAGS)
  header vars: can determine whether we are running under GNU make
  NEWS: improve wording for automake bug#13514 fix
  NEWS: document fix for automake bug#13514

+ Extra non-trivial changes:

* lib/am/header-vars.am: Ignore all upstream changes, we shouldn't
need them.
* t/make-is-gnu.sh: Remove; our generated makefiles have no need to
test whether they are running under GNU make --- of course they are!

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

e402b325d6d5a58c67a794f9406008ae620a8c1e
diff --cc AUTHORS
index 7b11c8fdd,a3c5c0113..fbe165164
--- a/AUTHORS
+++ b/AUTHORS
@@@ -1,24 -1,27 +1,2 @@@
- Authors of GNU Automake-NG.
 -Authors of GNU Automake.
--
--David Mackenzie
--  First version of most ".am" files.
--  Wrote sh version of automake.in.
--
--Tom Tromey
--  Touched all ".am" files.
--  Rewrote automake.in
--
--Alexandre Oliva
--  Some of the user-side dependency tracking system.
--  Some more random hacking.
--
--Alexandre Duret-Lutz
--  Major overhaul of everything.
--  Maintenance since 2002.
--
--Ralf Wildenhues
--  Random breakage.
--  Maintenance since 2006.
--
  Stefano Lattarini
 -  Testsuite overhaul.
 -  TAP support and custom testsuite drivers.
 -  Random breakage.
 -  De-facto maintenance since 2012.
 +  Started the Automake-NG fork.
diff --cc doc/automake-ng.texi
index d20b7ae28,9c46b5c45..8f1cc0f9d
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@@ -9032,20 -9076,24 +9032,26 @@@ For best results, the tests should be v
  @vindex TEST_LOGS
  Each couple of @file{.log} and @file{.trs} files is created when the
  corresponding test has completed.  The set of log files is listed in
 -the read-only variable @code{TEST_LOGS}, and defaults to @code{TESTS},
 -with the executable extension if any (@pxref{EXEEXT}), as well as any
 -suffix listed in @code{TEST_EXTENSIONS} removed, and @file{.log} appended.
 -Results are undefined if a test file name ends in several concatenated
 -suffixes.  @code{TEST_EXTENSIONS} defaults to @file{.test}; it can be
 -overridden by the user, in which case any extension listed in it must be
 -constituted by a dot, followed by a non-digit alphabetic character,
 -followed by any number of alphabetic characters.
 -@c Keep in sync with test-extensions.sh
 -For example, @samp{.sh}, @samp{.T} and @samp{.t1} are valid extensions,
 -while @samp{.x-y}, @samp{.6c} and @samp{.t.1} are not.
 +the @emph{read-only} variable @code{TEST_LOGS}, and defaults to
 +@code{TESTS}, with the executable extension if any (@pxref{EXEEXT}),
 +as well as any suffix listed in @code{TEST_EXTENSIONS} removed, and
 +@file{.log} appended.  @code{TEST_EXTENSIONS} defaults to @file{.test};
 +it can be overridden by the user, in which case any extension listed
 +in it must start with a dot (the generated Makefile will check at
 +runtime that this is the case, and error out if it's not).  While
 +@code{TEST_EXTENSIONS} entries could in theory support ``funny
 +characters'' (like @samp{@@} or @samp{!}), their use might cause
 +unexpected problems for the underlying GNU make implementation, so
 +you're advised to limit to the use of alphanumeric characters, plus
 +eventually the underscore @samp{_}, the dot @samp{.}, the dash
 +@samp{-} characters.
  
+ @cindex Configure substitutions in @code{TESTS}
+ It is important to note that, due to current limitations (unlikely to be
+ lifted), configure substitutions in the definition of @code{TESTS} can
+ only work if they will expand to a list of tests that have a suffix listed
+ in @code{TEST_EXTENSIONS}.
+ 
  @vindex _LOG_COMPILE
  @vindex _LOG_COMPILER
  @vindex _LOG_FLAGS