[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1339-g317cf07

[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=317cf071f3835ef0f36fc3c111a6db7bbdebf644

The branch, testsuite-work has been updated
       via  317cf071f3835ef0f36fc3c111a6db7bbdebf644 (commit)
       via  8cee92bd50e2c5ca47029aec11b35817e30b3bf0 (commit)
       via  074b1188ea90da631ead2201ef66c7375d5a1e5c (commit)
       via  5e4631085ef78ab2385429e123006e9daa1e7d7d (commit)
      from  efdc3e177d74e62f18dbe6a8c0d3577288e64578 (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 317cf071f3835ef0f36fc3c111a6db7bbdebf644
Merge: efdc3e1 8cee92b
Author: Stefano Lattarini <address@hidden>
Date:   Sun Sep 11 00:45:34 2011 +0200

    Merge branch 'test-protocols' into testsuite-work
    
    * test-protocols:
      tests: fix spurious failure on fast machines

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

Summary of changes:
 ChangeLog                |    8 ++++++++
 tests/aclocal-acdir.test |   18 ++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e1e3d89..de0fa2c 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-10  Stefano Lattarini  <address@hidden>
 
        tests: minor optimizations/simplifications in some aclocal tests
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