summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-12-28 15:15:50 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-12-28 15:19:19 +0100
commit3474910563edf9a0e4021b1c75c55b569bfc1f3e (patch)
tree36ca8ba51ec5928b449fb477526a71154a7964e3 /tests
parente6fa05e7c7df67117138bf131e1599b346213bd0 (diff)
downloadautomake-3474910563edf9a0e4021b1c75c55b569bfc1f3e.tar.gz
tests: fix spurious failure due to autom4te caching
* tests/acloca18.test: Remove stale autom4te.cache directories, to prevent racy, spurious failures. * tests/python11.test: Likewise. Fix a typo in comments since we are at it.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/acloca18.test12
-rwxr-xr-xtests/python11.test6
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 5032a8d9e..de997869a 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -59,33 +59,33 @@ $AUTOCONF
grep macro11 foo
grep macro21 foo
-rm -f foo
+rm -rf foo autom4te*.cache
$ACLOCAL -I 1 -I 2 -I 3 -I 4 --install
$AUTOCONF
./configure
grep macro12 foo
grep macro23 foo
-rm -f foo
+rm -rf foo autom4te*.cache
$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install --dry-run
$AUTOCONF
./configure
grep macro12 foo
grep macro23 foo
-rm -f foo
+rm -rf foo autom4te*.cache
$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install
$AUTOCONF
./configure
grep macro14 foo
grep macro23 foo
-rm -f foo
+rm -rf foo autom4te*.cache
$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 -f foo
+rm -rf foo autom4te*.cache
$ACLOCAL -I 4 -I 1 --install
$AUTOCONF
./configure
@@ -98,7 +98,7 @@ cat >dirlist-test/m1.m4 <<EOF
AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
EOF
-rm -f foo
+rm -rf foo autom4te*.cache
$ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
cat stderr >&2
cat stdout
diff --git a/tests/python11.test b/tests/python11.test
index 0f15f375f..6a14368c1 100755
--- a/tests/python11.test
+++ b/tests/python11.test
@@ -44,9 +44,9 @@ grep 'no suitable Python interpreter found' stderr
sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.in >configure.int
mv -f configure.int configure.in
-$ACLOCAL
-$AUTOCONF
-# This one should define PYTHON as : and exit succesfully
+$ACLOCAL --force
+$AUTOCONF --force
+# This one should define PYTHON as ":" and exit successfully.
./configure
# Any user setting should be used.