Re: [PATCH] {testsuite-work} tests: remove 'test_prefer_config_shell' from the environment

[Stefano Lattarini]

On Thursday 16 June 2011, Stefano Lattarini wrote:
> On Monday 13 June 2011, Stefano Lattarini wrote:
> > On Monday 06 June 2011, Stefano Lattarini wrote:
> > > With the previous commit, the user could prefer the use of $SHELL
> > > over /bin/sh in some tests checking the Automake-provided shell
> > > scripts by manually exporting `test_prefer_config_shell' to "yes"
> > > in the environment.  With this commit, we ensure that such tests
> > > *always* and *transparently* run using both $SHELL and /bin/sh
> > > to execute the checked scripts.  The `test_prefer_config_shell'
> > > variable becomes an internal detail, and is no more meant to be
> > > manually defined or overridden.
> > > 
> > > * tests/defs-static.in: Check that `test_prefer_config_shell' is
> > > not exported in the environment.  Error out if this is the case.
> > >
> > [HUGE SNIP]
> > 
> > > diff --git a/tests/defs-static.in b/tests/defs-static.in
> > > index 53d9f93..17ed284 100644
> > > --- a/tests/defs-static.in
> > > +++ b/tests/defs-static.in
> > > @@ -70,7 +70,9 @@ fi
> > >  # Check that the environment is properly sanitized.
> > >  # Having variables exported to the empty string is OK, since our code
> > >  # treats such variables as if they were unset.
> > > -for var in me required parallel_tests original_AUTOMAKE 
> > > original_ACLOCAL; do
> > > +for var in me required parallel_tests test_prefer_config_shell \
> > > +           original_AUTOMAKE original_ACLOCAL
> > > +do
> > >    if eval "test x\"\$$var\" != x" && env | grep "^$var=" >/dev/null; then
> > >      echo "$argv0: variable \`$var' is set in the environment:" \
> > >           "this is unsafe" >&2
> > > 
> > Hmpf, this should have been complemented by a proper addition to
> > AM_TEST_ENVIRONMENT in tests/Makefile.am.  I will sooninsh apply
> > the attached follow-up patch if there is no objection.
> > 
> > Regards,
> >   Stefano
> > 
> Pushed now.
> 
> Regards,
>   Stefano
> 
Aargh!  I had forgotten to regenerate the Makefile.ins before pushing!

Fixed with the attached patch.

(/me starting to think whether it wouln't be better to remove the
autotools-generated files from the repository ...)

Sorry for the noise,
  Stefano

From f4057070950a5991a9adbe2e8bc8e78aa16d1895 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Thu, 16 Jun 2011 10:25:59 +0200
Subject: [PATCH] regenerate tests/Makefile.in

---
 tests/Makefile.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 39984b6..30965f4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -406,6 +406,7 @@ AM_TESTS_ENVIRONMENT = \
   test x"$$me" = x || unset me; \
   test x"$$required" = x || unset required; \
   test x"$$parallel_tests" = x || unset parallel_tests; \
+  test x"$$test_prefer_config_shell" || unset test_prefer_config_shell; \
   test x"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \
   test x"$$original_ACLOCAL" = x || unset original_ACLOCAL; \
   AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC; \
-- 
1.7.2.3