From: Akim Demaille Date: Sat, 28 Sep 2002 14:10:45 +0000 (+0000) Subject: * tests/torture.at (Configuring subdirectories): Be robust to X-Git-Tag: AUTOCONF-2.54a~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8ce69bb73079df713f768c39efa5b796c436f77;p=thirdparty%2Fautoconf.git * 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 994e14ab3..9f33af263 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-09-28 Akim Demaille + + * 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 * tests/m4sh.at (Functions Support, Functions and return Support): diff --git a/tests/torture.at b/tests/torture.at index ecd587945..ac6a37329 100644 --- 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