Re: Bug#355368: coreutils: FTBS if SHELL variable is not set

[Jim Meyering]

Sven Joachim <address@hidden> wrote:
> I hope you can remember this issue (dircolors test failing with SHELL
> unset) after more than five months. I'm quoting your whole mail:
...

[Context for any interested readers: http://bugs.debian.org/355368 ]

Thanks Sven,
I've done as you suggest, with minor syntactic changes:

2006-08-19  Jim Meyering  <address@hidden>

        Avoid test failure when `make check' is run through debuild.
        * tests/help-version: Ensure that $SHELL is set to some value
        and exported.  Patch from Sven Joachim.  For details, see
        <http://bugs.debian.org/355368>.

Index: tests/help-version
===================================================================
RCS file: /fetish/cu/tests/help-version,v
retrieving revision 1.21
diff -u -r1.21 help-version
--- tests/help-version  17 Aug 2006 19:58:24 -0000      1.21
+++ tests/help-version  19 Aug 2006 18:26:12 -0000
@@ -22,13 +22,11 @@
 
 test "$VERBOSE" = yes && set -x
 
-# Ensure that $SHELL is set to *some* value.
+# Ensure that $SHELL is set to *some* value and exported.
 # This is required for dircolors, which would fail e.g., when
 # invoked via debuild (which removes SHELL from the environment).
-if test "x$SHELL" = x; then
-  SHELL=/bin/sh
-  export SHELL
-fi
+test "x$SHELL" = x && SHELL=/bin/sh
+export SHELL
 
 expected_failure_status_nohup=127
 expected_failure_status_printenv=2