* tests/torture.at (Configuring subdirectories): Be robust to

users who use config.site to require for a cache: in this case,
the two last configure runs, using two different sets of
arguments, trigger a legitimate error.

diff --git a/ChangeLog b/ChangeLog
index 994e14ab33a7d3ce64fc40aaaf43bf560dd0cf0a..9f33af2636f96d58f425ae54aae701f05dee36e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-28  Akim Demaille  <akim@epita.fr>
+
+       * tests/torture.at (Configuring subdirectories): Be robust to
+       users who use config.site to require for a cache: in this case,
+       the two last configure runs, using two different sets of
+       arguments, trigger a legitimate error.
+
 2002-09-28  Akim Demaille  <akim@epita.fr>
 
        * tests/m4sh.at (Functions Support, Functions and return Support):

diff --git a/tests/torture.at b/tests/torture.at
index ecd587945ae42ba58f8960848382a0ffb675afaf..ac6a37329226db4fb19bed4af1414f506927c663 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -635,9 +635,12 @@ prefix=/usr/local
 ])
 
 # Make sure precious variables and command line options are properly
-# passed, even when there are duplicates.
-AT_CHECK([cd builddir && ../configure --prefix /bad --prefix /good INNER=bad INNER=good], 0, [ignore])
-AT_CHECK([cat builddir/inner/innermost/config], 0,
+# passed, even when there are duplicates.  Run another directory so
+# 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([cat builddir2/inner/innermost/config], 0,
 [INNER=good
 srcdir=../../../inner/innermost
 top_srcdir=../../../inner