[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1106-g8cee92b

[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=8cee92bd50e2c5ca47029aec11b35817e30b3bf0

The branch, test-protocols has been updated
       via  8cee92bd50e2c5ca47029aec11b35817e30b3bf0 (commit)
       via  074b1188ea90da631ead2201ef66c7375d5a1e5c (commit)
       via  5e4631085ef78ab2385429e123006e9daa1e7d7d (commit)
       via  0ae01e8cce1f89f8e45f621f5aa99cf563c52164 (commit)
       via  4412308796486424c901342ea9361cd0ce597184 (commit)
      from  ac2300d4878e0342fb292d9c2fbeaf717c15febb (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                |   15 +++++++++++++++
 aclocal.in               |    2 +-
 tests/aclocal-acdir.test |   18 ++++++++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d1d203e..11b8bb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-09-11  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure on fast machines
+       * tests/aclocal-acdir.test: Avoid spurious failures due to caching
+       issues, by cleaning the autom4te cache between all the aclocal
+       invocations, and by always calling autoconf with the `--force'
+       flag.
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       aclocal: better URL reference in error message
+       * aclocal.in (scan_file): In the error message about underquoted
+       definitions, reference the automake page at `www.gnu.org', not
+       at `sources.redhat.com'.
+
 2011-09-09  Stefano Lattarini  <address@hidden>
 
        coverage: distcheck-hook to catch missing/outdated *.m4 files
diff --git a/aclocal.in b/aclocal.in
index 02963ee..bc0804a 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -563,7 +563,7 @@ sub scan_file ($$$)
            {
              msg ('syntax', "$file:$.", "underquoted definition of $2"
                   . "\n  run info Automake 'Extending aclocal'\n"
-                  . "  or see http://sources.redhat.com/automake/";
+                  . "  or see http://www.gnu.org/software/automake/manual/";
                   . "automake.html#Extending-aclocal")
                unless $underquoted_manual_once;
              $underquoted_manual_once = 1;
diff --git a/tests/aclocal-acdir.test b/tests/aclocal-acdir.test
index c5cc992..e02db30 100755
--- a/tests/aclocal-acdir.test
+++ b/tests/aclocal-acdir.test
@@ -37,28 +37,28 @@ AC_DEFUN([MY_MACRO], [my--macro])
 END
 
 $ACLOCAL --automake-acdir am
-$AUTOCONF
+$AUTOCONF --force
 $FGREP 'fake--init--automake' configure
 $FGREP 'MY_MACRO' configure
 
 rm -rf autom4te*.cache
 
 $ACLOCAL --system-acdir sys
-$AUTOCONF
+$AUTOCONF --force
 $FGREP 'am__api_version' configure
 $FGREP 'my--macro' configure
 
 rm -rf autom4te*.cache
 
 $ACLOCAL --automake-acdir am --system-acdir sys
-$AUTOCONF
+$AUTOCONF --force
 $FGREP 'fake--init--automake' configure
 $FGREP 'my--macro' configure
 
 rm -rf autom4te*.cache
 
 $ACLOCAL --system-acdir sys --automake-acdir am
-$AUTOCONF
+$AUTOCONF --force
 $FGREP 'fake--init--automake' configure
 $FGREP 'my--macro' configure
 
@@ -69,21 +69,27 @@ cat > am/bar.m4 <<'END'
 AC_DEFUN([MY_MACRO], [am--macro])
 END
 $ACLOCAL --automake-acdir am --system-acdir sys
-$AUTOCONF
+$AUTOCONF --force
 $FGREP 'fake--init--automake' configure
 $FGREP 'am--macro' configure
 $FGREP 'my--macro' configure && Exit 1 # Just to be sure.
 
+rm -rf autom4te*.cache
+
 # Obsolescent `--acdir' option.
 $ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep '.*--acdir.*deprecated' stderr
 
+rm -rf autom4te*.cache
+
 $ACLOCAL -Wno-obsolete --acdir am
-$AUTOCONF
+$AUTOCONF --force
 $FGREP 'fake--init--automake' configure
 $FGREP 'am--macro' configure
 
+rm -rf autom4te*.cache
+
 $ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr


hooks/post-receive
-- 
GNU Automake