* tests/torture.at (Configuring subdirectories): Set CONFIG_SITE

to a nonexistent file, so that we don't have to worry about
a local site configuration that doesn't use /usr/local.
Problem reported by Keith Marshall in
<http://lists.gnu.org/archive/html/bug-autoconf/2006-06/msg00133.html>.

diff --git a/ChangeLog b/ChangeLog
index f0c114a049fde6fe0920c5f4421a2f8a65ed96af..cdb0895a4df3d9034a115ed03b98dc9453e7931e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * tests/torture.at (Configuring subdirectories): Set CONFIG_SITE
+       to a nonexistent file, so that we don't have to worry about
+       a local site configuration that doesn't use /usr/local.
+       Problem reported by Keith Marshall in
+       <http://lists.gnu.org/archive/html/bug-autoconf/2006-06/msg00133.html>.
+
 2006-06-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doc/autoconf.texi: Be more consistent about using @acronym with

diff --git a/tests/torture.at b/tests/torture.at
index c6c2237495fb9caca549dd4ed1c05247f6c102c2..97ec959ab5d584c72cb66ceaa39d00b55a847aa4 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -840,7 +840,7 @@ AT_CHECK([test -f inner/configure])
 
 # Running the outer configure recursively should provide the innermost
 # help strings.
-AT_CHECK([./configure --help=recursive | grep INNER], 0, [ignore])
+AT_CHECK([CONFIG_SITE=no-such-file ./configure --help=recursive | grep INNER], 0, [ignore])
 
 # Running the outer configure should trigger the inner.
 AT_CHECK_CONFIGURE
@@ -853,7 +853,7 @@ prefix=/usr/local
 
 # The same, but from a builddir.
 AS_MKDIR_P([builddir])
-AT_CHECK([cd builddir && ../configure], 0, [ignore])
+AT_CHECK([cd builddir && CONFIG_SITE=no-such-file ../configure], 0, [ignore])
 AT_CHECK([cat builddir/inner/innermost/config], 0,
 [INNER=inner
 srcdir=../../../inner/innermost
@@ -866,7 +866,7 @@ prefix=/usr/local
 # that if the user has set config.site to have a config.cache, then
 # the two runs don't have colliding caches.
 AS_MKDIR_P([builddir2])
-AT_CHECK([cd builddir2 && ../configure --prefix /bad --prefix /good INNER=bad INNER=good], 0, [ignore])
+AT_CHECK([cd builddir2 && CONFIG_SITE=no-such-file ../configure --prefix /bad --prefix /good INNER=bad INNER=good], 0, [ignore])
 AT_CHECK([cat builddir2/inner/innermost/config], 0,
 [INNER=good
 srcdir=../../../inner/innermost