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.

diff --git a/ChangeLog b/ChangeLog
index 7a481fab7155646d135ae4c7fd5ed026f5eabff0..0cab567a8b134be9c89426817223ebc61833a262 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        aclocal: better URL reference in error message

diff --git a/tests/aclocal-acdir.test b/tests/aclocal-acdir.test
index c5cc992f9bb62aca3f278deb619efa22f4780ae4..e02db30e173f91a6daf25100c8205275178095bb 100755 (executable)
--- 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