This test was failing in some environments.

* tests/ls/color-dtype-dir: Don't rely on eval "`dircolors -b`"
to set LS_COLORS in the environment.
* tests/envvar-check: Instead, ensure that LS_COLORS is not set.
Reported by Bob Proulx.

diff --git a/ChangeLog b/ChangeLog
index 9ff5811f7872126d5deaf8d93ba383e8c9991a89..acddff05a6ce9370968ad3095cb9ed7a119872ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@
 
 2006-08-26  Jim Meyering  <jim@meyering.net>
 
+       This test was failing in some environments.
+       * tests/ls/color-dtype-dir: Don't rely on eval "`dircolors -b`"
+       to set LS_COLORS in the environment.
+       * tests/envvar-check: Instead, ensure that LS_COLORS is not set.
+       Reported by Bob Proulx.
+
        * src/c99-to-c89.diff: Remove hunk for copy.c; no longer needed.
 
        * Makefile.am (EXTRA_DIST): Remove these files here, too:

diff --git a/tests/envvar-check b/tests/envvar-check
index 357a6176a30daad45c538f15e0ddb79cbf80bf2c..51c52221456cedf590b282bf7318b4952cfe2d32 100644 (file)
--- a/tests/envvar-check
+++ b/tests/envvar-check
@@ -33,6 +33,7 @@ vars='
   DF_BLOCK_SIZE
   DU_BLOCK_SIZE
   LS_BLOCK_SIZE
+  LS_COLORS
   POSIXLY_CORRECT
   SIMPLE_BACKUP_SUFFIX
   TIME_STYLE

diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir
index 2cd691170a832a2f920aef1fbc1e5d1b280de78c..a7169f7c141c2dbe30b291295afb23073458ff89 100755 (executable)
--- a/tests/ls/color-dtype-dir
+++ b/tests/ls/color-dtype-dir
@@ -48,19 +48,16 @@ fi
 
 fail=0
 
-# Ensure that LS_COLORS is set to known values.
-eval "`dircolors -b`"
-
 ls --color=always > out || fail=1
 cat -A out > o1 || fail=1
 echo >> o1 || fail=1
 mv o1 out || fail=1
 
 cat <<\EOF > exp || fail=1
-^[[00m^[[01;34md^[[00m$
-^[[34;42mother-writable^[[00m$
-^[[00mout^[[00m$
-^[[37;44msticky^[[00m$
+^[[0m^[[01;34md^[[0m$
+^[[34;42mother-writable^[[0m$
+^[[0mout^[[0m$
+^[[37;44msticky^[[0m$
 ^[[m
 EOF