test-lib: fix TERM to dumb for test repeatability

Dscho noticed that Term::ReadLine (used by send-email) colorized its
output for his TERM settings, inside t9001 tests.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/test-lib.sh b/t/test-lib.sh
index c0c5e21adfebba8fc82a0d5308eb04c59c33aece..44f5776a1b30895e8d7b2d0601c8edc677790eeb 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -3,12 +3,16 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
 # Copyright (c) 2005 Junio C Hamano
 #
 

+# Keep the original TERM for say_color
+ORIGINAL_TERM=$TERM
+

 # For repeatability, reset the environment to known value.
 LANG=C
 LC_ALL=C
 PAGER=cat
 TZ=UTC
 # For repeatability, reset the environment to known value.
 LANG=C
 LC_ALL=C
 PAGER=cat
 TZ=UTC

-export LANG LC_ALL PAGER TZ
+TERM=dumb
+export LANG LC_ALL PAGER TERM TZ

 EDITOR=:
 VISUAL=:
 unset GIT_EDITOR
 EDITOR=:
 VISUAL=:
 unset GIT_EDITOR


@@ -58,12 +62,14 @@ esac
 # This test checks if command xyzzy does the right thing...
 # '
 # . ./test-lib.sh
 # This test checks if command xyzzy does the right thing...
 # '
 # . ./test-lib.sh

-
-[ "x$TERM" != "xdumb" ] &&
-       [ -t 1 ] &&
-       tput bold >/dev/null 2>&1 &&
-       tput setaf 1 >/dev/null 2>&1 &&
-       tput sgr0 >/dev/null 2>&1 &&
+[ "x$ORIGINAL_TERM" != "xdumb" ] && (
+               TERM=$ORIGINAL_TERM &&
+               export TERM &&
+               [ -t 1 ] &&
+               tput bold >/dev/null 2>&1 &&
+               tput setaf 1 >/dev/null 2>&1 &&
+               tput sgr0 >/dev/null 2>&1
+       ) &&

        color=t
 
 while test "$#" -ne 0
        color=t
 
 while test "$#" -ne 0


@@ -91,6 +97,9 @@ done
 
 if test -n "$color"; then
        say_color () {
 
 if test -n "$color"; then
        say_color () {

+               (
+               TERM=$ORIGINAL_TERM
+               export TERM

                case "$1" in
                        error) tput bold; tput setaf 1;; # bold red
                        skip)  tput bold; tput setaf 2;; # bold green
                case "$1" in
                        error) tput bold; tput setaf 1;; # bold red
                        skip)  tput bold; tput setaf 2;; # bold green


@@ -101,6 +110,7 @@ if test -n "$color"; then
                shift
                echo "* $*"
                tput sgr0
                shift
                echo "* $*"
                tput sgr0

+               )

        }
 else
        say_color() {
        }
 else
        say_color() {