Re: aclocal6.test failure

[Alexandre Duret-Lutz]

>>> "Bruno" == Bruno Haible <address@hidden> writes:

[...]

 Bruno> It fails in aclocal6.test line 82 at the first

 Bruno> test -d ../autom4te.cache

 Bruno> because no autom4te.cache directory exists. Obviously
 Bruno> that's a mistake in the test.

Thanks Bruno!  I'm installing this on HEAD and branch-1-8.


2003-12-15  Alexandre Duret-Lutz  <address@hidden>

        * tests/aclocal6.test: Check for autom4te.cache only if it has
        been created.
        * tests/maintclean.test: Update comment.
        Report from Bruno Haible.

Index: tests/aclocal6.test
===================================================================
RCS file: /cvs/automake/automake/tests/aclocal6.test,v
retrieving revision 1.3
diff -u -r1.3 aclocal6.test
--- tests/aclocal6.test 27 Jun 2003 18:35:14 -0000      1.3
+++ tests/aclocal6.test 15 Dec 2003 22:43:18 -0000
@@ -48,6 +48,13 @@
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
 
+# Users can disable autom4te.cache.
+if test -d autom4te.cache; then
+  test_cache='test -d'
+else
+  test_cache=:
+fi
+
 mkdir build
 cd build
 
@@ -79,7 +86,7 @@
 # Make sure maintainer-clean works in VPATH builds.
 # (This is unrelated to the rest of this test.)
 $MAKE clean
-test -d ../autom4te.cache
+$test_cache ../autom4te.cache
 test -f Makefile
 test -f sub/Makefile
 $MAKE maintainer-clean
Index: tests/maintclean.test
===================================================================
RCS file: /cvs/automake/automake/tests/maintclean.test,v
retrieving revision 1.7
diff -u -r1.7 maintclean.test
--- tests/maintclean.test       14 Nov 2003 21:25:59 -0000      1.7
+++ tests/maintclean.test       15 Dec 2003 22:43:18 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -45,7 +45,7 @@
 $AUTOCONF
 $AUTOMAKE
 
-# autom4te.cache appears with Autoconf >= 2.53.
+# Users can disable autom4te.cache.
 if test -d autom4te.cache; then
   test_cache='test -d autom4te.cache'
 else

-- 
Alexandre Duret-Lutz