[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-626-g92f688d

[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=92f688d82f4562bf27948b4bd3780a3b18eee8cf

The branch, maint has been updated
       via  92f688d82f4562bf27948b4bd3780a3b18eee8cf (commit)
      from  e3b0e12400f5fa4220fc0aa79dd0989e56def9c6 (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 92f688d82f4562bf27948b4bd3780a3b18eee8cf
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jan 6 13:15:17 2012 +0100

    tests: fix spurious failures due to autom4te caching
    
    * tests/aclocal9.test: Call aclocal and autoconf with the `--force'
    option.
    * tests/acloca10.test: Sleep between re-runs of aclocal and autoconf.
    * tests/acloca18.test: Explicitly remove also the configure script
    and the aclocal.m4 before re-invoking aclocal and autoconf.

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

Summary of changes:
 tests/acloca10.test |    8 +++++++-
 tests/acloca18.test |   20 +++++++++++++-------
 tests/aclocal9.test |    6 +++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/tests/acloca10.test b/tests/acloca10.test
index d7a058f..581fe77 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -55,6 +55,8 @@ grep MACRO3 aclocal.m4
 test ! -f m4_1/macro.m4
 test ! -f m4_2/macro.m4
 
+$sleep
+
 $ACLOCAL -I m4_2 -I m4_1
 $AUTOCONF
 ./configure
@@ -65,6 +67,8 @@ grep MACRO3 aclocal.m4
 test ! -f m4_1/macro.m4
 test ! -f m4_2/macro.m4
 
+$sleep
+
 $ACLOCAL -I m4_1 -I m4_2 --install
 $AUTOCONF
 ./configure
@@ -76,6 +80,8 @@ test -f m4_1/macro.m4
 test ! -f m4_2/macro.m4
 cp aclocal.m4 copy.m4
 
+$sleep
+
 echo '#GREPME' >>dirlist-test/macro.m4
 $ACLOCAL -I m4_1 -I m4_2 --install
 $AUTOCONF
diff --git a/tests/acloca18.test b/tests/acloca18.test
index de99786..589f0f2 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2008, 2010, 2012 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,39 +54,44 @@ cat >4/mumble.m4 <<EOF
 AC_DEFUN([AM_MACRO1], [echo macro14 >> foo])
 EOF
 
+clean_stale ()
+{
+  rm -rf aclocal.m4 configure foo autom4te*.cache
+}
+
 $ACLOCAL -I 1 -I 2 -I 3 -I 4
 $AUTOCONF
 ./configure
 grep macro11 foo
 grep macro21 foo
 
-rm -rf foo autom4te*.cache
+clean_stale
 $ACLOCAL  -I 1 -I 2 -I 3 -I 4 --install
 $AUTOCONF
 ./configure
 grep macro12 foo
 grep macro23 foo
 
-rm -rf foo autom4te*.cache
+clean_stale
 $ACLOCAL -I 4 -I 1 -I 2 -I 3 --install --dry-run
 $AUTOCONF
 ./configure
 grep macro12 foo
 grep macro23 foo
 
-rm -rf foo autom4te*.cache
+clean_stale
 $ACLOCAL -I 4 -I 1 -I 2 -I 3 --install
 $AUTOCONF
 ./configure
 grep macro14 foo
 grep macro23 foo
 
-rm -rf foo autom4te*.cache
+clean_stale
 $ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'macro.*AM_MACRO2.*not found' stderr
 
-rm -rf foo autom4te*.cache
+clean_stale
 $ACLOCAL -I 4 -I 1 --install
 $AUTOCONF
 ./configure
@@ -98,7 +104,7 @@ cat >dirlist-test/m1.m4 <<EOF
 AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
 AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
 EOF
-rm -rf foo autom4te*.cache
+clean_stale
 $ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
   cat stderr >&2
   cat stdout
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
index 325f6ae..7a786aa 100755
--- a/tests/aclocal9.test
+++ b/tests/aclocal9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,8 +42,8 @@ $AUTOCONF
 grep macro11 foo
 grep macro21 foo
 
-$ACLOCAL -I m4_2 -I m4_1
-$AUTOCONF
+$ACLOCAL --force -I m4_2 -I m4_1
+$AUTOCONF --force
 ./configure
 grep macro12 foo
 grep macro21 foo


hooks/post-receive
-- 
GNU Automake