summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-08-19 18:30:04 +0000
committerJim Meyering <jim@meyering.net>2006-08-19 18:30:04 +0000
commit77c8f5b5c2e18bf2f73945653e830d07ddcd381e (patch)
treef94e86429f4c8da5274a61ee123e5db1cca2eee0
parent6a15128cef36588a89ff228dc362e7d9ba92d3ed (diff)
downloadcoreutils-77c8f5b5c2e18bf2f73945653e830d07ddcd381e.tar.xz
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>.
-rw-r--r--ChangeLog5
-rwxr-xr-xtests/help-version8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cbe595c4b..c5bad2fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-08-19 Jim Meyering <jim@meyering.net>
+ 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>.
+
* tests/ls/stat-dtype: Test for the 2006-08-17 `ls -CF' fix.
* README: Describe potential "pre-C99 build failure", and work-around.
diff --git a/tests/help-version b/tests/help-version
index 2ed9312f0..a16ec0176 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -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