[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-444-g5e46310

[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=5e4631085ef78ab2385429e123006e9daa1e7d7d

The branch, maint has been updated
       via  5e4631085ef78ab2385429e123006e9daa1e7d7d (commit)
      from  4412308796486424c901342ea9361cd0ce597184 (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                |    8 ++++++++
 tests/aclocal-acdir.test |   18 ++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a481fa..0cab567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
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