From dcfa118a7f22cc2ce34f47844670bf90d3330a0f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 30 Jun 2006 07:19:46 +0000 Subject: [PATCH] * 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 . --- ChangeLog | 8 ++++++++ tests/torture.at | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0c114a0..cdb0895a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-06-30 Paul Eggert + + * 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 + . + 2006-06-28 Paul Eggert * doc/autoconf.texi: Be more consistent about using @acronym with diff --git a/tests/torture.at b/tests/torture.at index c6c22374..97ec959a 100644 --- 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