[SCM] GNU Autoconf source repository branch, master, updated. v2.67-65-g9144856

[Eric Blake]

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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=9144856609b28e8b4f58bca4d44489ddc23170a9

The branch, master has been updated
       via  9144856609b28e8b4f58bca4d44489ddc23170a9 (commit)
       via  0cca574572a7ea89f31ca50df05e65c8d97ac905 (commit)
       via  793b3a74c492afbf4c08608e39bb6529bc6c8274 (commit)
      from  97d209ddb1ae2ccc0ac3c5272341252bbec39bed (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 9144856609b28e8b4f58bca4d44489ddc23170a9
Author: Stefano Lattarini <address@hidden>
Date:   Mon Sep 13 20:26:40 2010 +0200

    tests: simplify grepping of 'automake --version'.
    
    * tests/tools.at (autom4te preselections): Remove minor
    redundancies in regular expressions used to grep the output
    'automake --version' for test skipping.
    * tests/torture.at (Configuring subdirectories)
    (Unusual Automake input files): Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 0cca574572a7ea89f31ca50df05e65c8d97ac905
Author: Eric Blake <address@hidden>
Date:   Mon Sep 13 11:31:23 2010 -0600

    autotest: work around zsh bug
    
    * lib/autotest/general.m4 (AT_DATA): Special case an empty data
    file, since zsh botches empty here-docs.
    * doc/autoconf.texi (Writing Testsuites) <AT_DATA>: Document that
    this allows empty contents.
    * tests/autotest.at (AT_DATA): New test.
    Reported by Ralf Wildenhues.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 793b3a74c492afbf4c08608e39bb6529bc6c8274
Author: Eric Blake <address@hidden>
Date:   Mon Sep 13 10:42:09 2010 -0600

    docs: mention gnulib portability docs
    
    * doc/autoconf.texi (Function Portability, Header Portability):
    Add external links to gnulib.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog               |   23 +++++++++++++++++++++++
 doc/autoconf.texi       |   20 +++++++++++++++-----
 lib/autotest/general.m4 |    8 +++++---
 tests/autotest.at       |   19 +++++++++++++++++++
 tests/tools.at          |    2 +-
 tests/torture.at        |    4 ++--
 6 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9431c94..be3c8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-09-13  Stefano Lattarini  <address@hidden>
+
+       tests: simplify grepping of 'automake --version'.
+       * tests/tools.at (autom4te preselections): Remove minor
+       redundancies in regular expressions used to grep the output
+       'automake --version' for test skipping.
+       * tests/torture.at (Configuring subdirectories)
+       (Unusual Automake input files): Likewise.
+
+2010-09-13  Eric Blake  <address@hidden>
+
+       autotest: work around zsh bug
+       * lib/autotest/general.m4 (AT_DATA): Special case an empty data
+       file, since zsh botches empty here-docs.
+       * doc/autoconf.texi (Writing Testsuites) <AT_DATA>: Document that
+       this allows empty contents.
+       * tests/autotest.at (AT_DATA): New test.
+       Reported by Ralf Wildenhues.
+
+       docs: mention gnulib portability docs
+       * doc/autoconf.texi (Function Portability, Header Portability):
+       Add external links to gnulib.
+
 2010-09-13  Ralf Wildenhues  <address@hidden>
            Gary V. Vaughan <address@hidden>
 
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 71eefa4..8471525 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -4525,7 +4525,12 @@ it, then you can use one of the general function-check 
macros.
 Most usual functions can either be missing, or be buggy, or be limited
 on some architectures.  This section tries to make an inventory of these
 portability issues.  By definition, this list always requires
-additions.  Please help us keeping it as complete as possible.
+additions.  A much more complete list is maintained by the Gnulib
+project (@pxref{Gnulib}), covering @ref{Function Substitutes, ,
+Current Posix Functions, gnulib, GNU gnulib}, @ref{Legacy Function
+Substitutes, , Legacy Functions, gnulib, GNU gnulib}, and @ref{Glibc
+Function Substitutes, , Glibc Functions, gnulib, GNU gnulib}.  Please
+help us keep the gnulib list as complete as possible.
 
 @table @asis
 @item @code{exit}
@@ -5669,9 +5674,13 @@ it, then you can use one of the general header-file 
check macros.
 @cindex Portability of headers
 @cindex Header portability
 
-This section tries to collect knowledge about common headers, and the
-problems they cause.  By definition, this list always requires
-additions.  Please help us keeping it as complete as possible.
+This section documents some collected knowledge about common headers,
+and the problems they cause.  By definition, this list always requires
+additions.  A much more complete list is maintained by the Gnulib
+project (@pxref{Gnulib}), covering @ref{Header File Substitutes, ,
+Posix Headers, gnulib, GNU gnulib} and @ref{Glibc Header File
+Substitutes, , Glibc Headers, gnulib, GNU gnulib}.  Please help us keep
+the gnulib list as complete as possible.
 
 @table @asis
 
@@ -24184,7 +24193,8 @@ End the current test group.
 Initialize an input data @var{file} with given @var{contents}.  Of
 course, the @var{contents} have to be properly quoted between square
 brackets to protect against included commas or spurious M4
-expansion.  The contents must end with an end of line.  @var{file} must
+expansion.  @var{contents} must be empty or end with a newline.
address@hidden must
 be a single shell word that expands into a single file name.
 @end defmac
 
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index cdc82b9..78f1cc6 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1947,14 +1947,16 @@ 
at_banner_text_[]AT_banner_ordinal="AS_ESCAPE([$1])"])dnl
 
 # AT_DATA(FILE, CONTENTS)
 # -----------------------
-# Initialize an input data FILE with given CONTENTS, which should end with
-# an end of line.
+# Initialize an input data FILE with given CONTENTS, which should be
+# empty or end with a newline.
 # This macro is not robust to active symbols in CONTENTS *on purpose*.
 # If you don't want CONTENTS to be evaluated, quote it twice.
 _AT_DEFINE_SETUP([AT_DATA],
+[m4_if([$2], [], [: >$1],
+       [$2], [[]], [: >$1],
 [cat >$1 <<'_ATEOF'
 $2[]_ATEOF
-])
+])])
 
 
 # AT_CHECK(COMMANDS, [STATUS = 0], STDOUT, STDERR,
diff --git a/tests/autotest.at b/tests/autotest.at
index ab04dbe..323006e 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -159,6 +159,25 @@ AT_CHECK([sed 50q micro-suite | grep 'This is just a test 
notice'],
 [--version])
 
 
+## --------- ##
+## AT_DATA.  ##
+## --------- ##
+
+AT_CHECK_AT_TEST([AT@&address@hidden, [
+AT_CHECK([test -f file1], [1])
+AT_DATA([file1])
+AT_CHECK([test -f file1 && test ! -s file1])
+AT_CHECK([echo hi > file1])
+AT_DATA([file1], [[]])
+AT_CHECK([test -f file1 && test ! -s file1])
+file=file2
+AT_DATA([$file], [[$file
+]])
+AT_CHECK([echo '$file' > file3])
+AT_CHECK([cmp file2 file3])
+])
+
+
 ## ------------------ ##
 ## Empty test suite.  ##
 ## ------------------ ##
diff --git a/tests/tools.at b/tests/tools.at
index bd50a64..c89ac4c 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -1166,7 +1166,7 @@ AT_SETUP([autom4te preselections])
 
 # We use aclocal and automake.  Skip broken automake wrappers.
 AT_CHECK([automake --version || exit 77], [], [stdout], [ignore])
-AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9]' stdout || exit 77]], [], [ignore])
 AT_CHECK([test ! -f $HOME/.autom4te.cfg || exit 77], [], [ignore], [ignore])
 
 AT_DATA([configure.in],
diff --git a/tests/torture.at b/tests/torture.at
index 7fd85a2..673c7a5 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1429,7 +1429,7 @@ AT_KEYWORDS(autoreconf)
 
 # We use aclocal (via autoreconf).
 AT_CHECK([aclocal --version || exit 77], [], [stdout], [ignore])
-AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9]' stdout || exit 77]], [], [ignore])
 
 # It should understand configure.ac.
 AT_CHECK([[grep '[^0-9]1\.[01234][^0-9]' stdout && exit 77]], [1], [ignore])
@@ -1812,7 +1812,7 @@ AT_KEYWORDS([autoreconf])
 
 # We use aclocal and automake via autoreconf.
 AT_CHECK([automake --version || exit 77], [], [stdout], [ignore])
-AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9]' stdout || exit 77]], [], [ignore])
 
 AT_DATA([configure.in],
 [[AC_INIT(GNU foo, 1.0)


hooks/post-receive
-- 
GNU Autoconf source repository