diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-06 13:15:17 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-06 14:23:06 +0100 |
| commit | 92f688d82f4562bf27948b4bd3780a3b18eee8cf (patch) | |
| tree | 05a6e6f2c49c5c27ae76a5b2b92a5da2bbd6590e /tests/acloca18.test | |
| parent | e3b0e12400f5fa4220fc0aa79dd0989e56def9c6 (diff) | |
| download | automake-92f688d82f4562bf27948b4bd3780a3b18eee8cf.tar.gz | |
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.
Diffstat (limited to 'tests/acloca18.test')
| -rwxr-xr-x | tests/acloca18.test | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tests/acloca18.test b/tests/acloca18.test index de997869a..589f0f2d3 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 |