From 09152f2d75d42c4c840d2e5cf25dcb2d7133055b Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Tue, 28 Apr 2015 21:24:57 +0100 Subject: tests: run ls capability coloring test irrespective of $LS_COLORS * tests/ls/no-cap.sh: Ensure the test isn't skipped even if capability coloring is disabled in the current $LS_COLORS. Also just enable/disable capability coloring to avoid the dircolors(1) overhead. --- tests/ls/no-cap.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh index 625f8397e..ecbfb31ca 100755 --- a/tests/ls/no-cap.sh +++ b/tests/ls/no-cap.sh @@ -20,13 +20,14 @@ print_ver_ ls require_strace_ capget +LS_COLORS=ca=1; export LS_COLORS strace -e capget ls --color=always > /dev/null 2> out || fail=1 $EGREP 'capget\(' out || skip_ "your ls doesn't call capget" rm -f out -eval "$(TERM=xterm dircolors -b | sed 's/ca=[^:]*:/ca=:/')" -strace -e capget ls --color=always > /dev/null 2> out || fail=1 +LS_COLORS=ca=:; export LS_COLORS +strace -e capget ls --color=always > /dev/null 2> out || fail=1 $EGREP 'capget\(' out && fail=1 Exit $fail -- cgit v1.2.3-70-g09d2