Re: coreutils-6.1: needs 'ls' patch (bug #15043)

[Jim Meyering]

address@hidden (Bob Proulx) wrote:
> Jim Meyering wrote:
>> I've checked this in on the trunk:
>>      * tests/ls/color-dtype-dir: New file.  Test for the above fix.
>
> I am seeing this test failure.
>
>   make[3]: Entering directory 
> `/usr/local/build/coreutils/i686-gnu-linux-coreutils/build/tests/ls'
>   out exp differ: char 5, line 1
>   1,4c1,4
>   < ^[[0m^[[01;34md^[[0m$
>   < ^[[34;42mother-writable^[[0m$
>   < ^[[0mout^[[0m$
>   < ^[[37;44msticky^[[0m$
>   ---
>   > ^[[00m^[[01;34md^[[00m$
>   > ^[[34;42mother-writable^[[00m$
>   > ^[[00mout^[[00m$
>   > ^[[37;44msticky^[[00m$
>   FAIL: color-dtype-dir

Hi Bob,

Thanks for the quick report!
I wonder why I can't reproduce it here...

Anyhow, I think I know at least part of the reason for the difference.
So this patch might fix it for you.
Does it?

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

        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.

Index: tests/ls/color-dtype-dir
===================================================================
RCS file: /fetish/cu/tests/ls/color-dtype-dir,v
retrieving revision 1.1
diff -u -r1.1 color-dtype-dir
--- tests/ls/color-dtype-dir    26 Aug 2006 06:46:18 -0000      1.1
+++ tests/ls/color-dtype-dir    26 Aug 2006 18:24:56 -0000
@@ -48,19 +48,16 @@
 
 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
 
Index: tests/envvar-check
===================================================================
RCS file: /fetish/cu/tests/envvar-check,v
retrieving revision 1.8
diff -u -r1.8 envvar-check
--- tests/envvar-check  17 Aug 2006 19:58:24 -0000      1.8
+++ tests/envvar-check  26 Aug 2006 18:24:21 -0000
@@ -33,6 +33,7 @@
   DF_BLOCK_SIZE
   DU_BLOCK_SIZE
   LS_BLOCK_SIZE
+  LS_COLORS
   POSIXLY_CORRECT
   SIMPLE_BACKUP_SUFFIX
   TIME_STYLE