Re: gentoo GNU/Linux - automake-1.9.2 2 of 511 tests failed

[Alexandre Duret-Lutz]

>>> "Mark" == Mark D Baushke <address@hidden> writes:

 Mark> Alexandre Duret-Lutz <address@hidden> writes:
 >> On Fri, Oct 08, 2004 at 01:40:34AM -0700, Mark D. Baushke wrote:
 >> >
 >> >   FAIL: missing.test
 >> >   FAIL: missing2.test
 >> >
 >> 
 >> Thanks for the report.  Could you run these two tests and report
 >> their output? (See tests/README.)

 Mark> Here you go.

Thank you.  The failures were caused by the AUTOCONF variable
being exported.

I'm installing the following fix on HEAD and branch-1-9.

2004-10-12  Alexandre Duret-Lutz  <address@hidden>

        * configure.ac: Export @address@hidden
        * tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@,
        so the test suite runs `autoconf' and not `missing --run autoconf'.
        * tests/missing.test, tests/missing2.test: Arrange for missing
        to be used in front of autoconf even if the user has exported
        AUTOCONF.  This fixes two spurious failures reported by
        Mark D. Baushke.

Index: configure.ac
===================================================================
RCS file: /cvs/automake/automake/configure.ac,v
retrieving revision 1.20.2.6
diff -u -r1.20.2.6 configure.ac
--- configure.ac        19 Sep 2004 22:58:04 -0000      1.20.2.6
+++ configure.ac        12 Oct 2004 19:07:29 -0000
@@ -31,10 +31,10 @@
 
 AC_CANONICAL_BUILD
 
-# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it;
-# this way we can run Autoconf tests from configure without being
-# bothered by `missing'.
-am_AUTOCONF=${AUTOCONF-autoconf}
+# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
+# way we can run Autoconf tests from configure (or from the test
+# suite) without being bothered by `missing'.
+AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"])
 
 AM_INIT_AUTOMAKE([1.8a dist-bzip2 filename-length-max=99])
 
Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.30
diff -u -r1.30 defs.in
--- tests/defs.in       3 Jun 2004 21:19:30 -0000       1.30
+++ tests/defs.in       12 Oct 2004 19:07:30 -0000
@@ -70,7 +70,7 @@
 # User can override various tools used.
 test -z "$PERL" && PERL='@PERL@'
 test -z "$MAKE" && MAKE=make
-test -z "$AUTOCONF" && AUTOCONF="@AUTOCONF@"
+test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@"
 test -z "$AUTOHEADER" && AUTOHEADER="@AUTOHEADER@"
 test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
 test -z "$MISSING" && MISSING=`pwd`/../lib/missing
Index: tests/missing.test
===================================================================
RCS file: /cvs/automake/automake/tests/missing.test,v
retrieving revision 1.1
diff -u -r1.1 missing.test
--- tests/missing.test  6 Sep 2003 21:10:40 -0000       1.1
+++ tests/missing.test  12 Oct 2004 19:07:30 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -34,7 +34,14 @@
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
-./configure
+
+# Make sure we do use missing, even if the user exported AUTOCONF.
+# (We cannot export this new value, because it would be used by Automake
+# when tracing, and missing is no good for this.)
+MYAUTOCONF="`pwd`/missing --run $AUTOCONF"
+unset AUTOCONF
+
+./configure AUTOCONF="$MYAUTOCONF"
 $MAKE
 $sleep
 # Hopefully the install version of Autoconf cannot compete with this one...
@@ -43,10 +50,10 @@
 
 # Run again, but without missing, to ensure that timestamps were updated.
 export AUTOMAKE ACLOCAL
-./configure
+./configure AUTOCONF="$MYAUTOCONF"
 $MAKE
 
-# Make sure $MAKE fail when timestamps aren't updated and missing is not used.
+# Make sure $MAKE fails when timestamps aren't updated and missing is not used.
 $sleep
 touch aclocal.m4
 $MAKE && exit 1
Index: tests/missing2.test
===================================================================
RCS file: /cvs/automake/automake/tests/missing2.test,v
retrieving revision 1.1
diff -u -r1.1 missing2.test
--- tests/missing2.test 6 Sep 2003 21:10:40 -0000       1.1
+++ tests/missing2.test 12 Oct 2004 19:07:30 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -37,7 +37,13 @@
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
-./configure
+
+# See missing.test for explanations about this.
+MYAUTOCONF="`pwd`/missing --run $AUTOCONF"
+unset AUTOCONF
+
+./configure AUTOCONF="$MYAUTOCONF"
+
 $MAKE
 $sleep
 # Hopefully the install version of Autoconf cannot compete with this one...
@@ -46,7 +52,7 @@
 
 # Run again, but without missing, to ensure that timestamps were updated.
 export AUTOMAKE ACLOCAL
-./configure
+./configure AUTOCONF="$MYAUTOCONF"
 $MAKE
 
 # Make sure $MAKE fail when timestamps aren't updated and missing is not used.

-- 
Alexandre Duret-Lutz