Re: [PATCH] t9001: set TERM=dumb to prevent ANSI output
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] t9001: set TERM=dumb to prevent ANSI output · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH] t9001: set TERM=dumb to prevent ANSI output · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] t9001: set TERM=dumb to prevent ANSI output · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH] t9001: set TERM=dumb to prevent ANSI output · Christian Couder <hidden>
- 2016-06-15 · Re: [PATCH] t9001: set TERM=dumb to prevent ANSI output · Junio C Hamano <hidden>
Junio C Hamano [off-list ref] writes:
Christian Couder [off-list ref] writes: ...quoted
This may not work well with colored output. In test-lib.sh line 62 there is : [ "x$TERM" != "xdumb" ] && [ -t 1 ] && tput bold >/dev/null 2>&1 && tput setaf 1 >/dev/null 2>&1 && tput sgr0 >/dev/null 2>&1 && color=tAhh. Sorry about that.
Ahem, third time lucky. -- >8 -- [PATCH] 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 <redacted> --- t/test-lib.sh | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index c0c5e21..44f5776 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh@@ -3,12 +3,16 @@ # 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 -export LANG LC_ALL PAGER TZ +TERM=dumb +export LANG LC_ALL PAGER TERM TZ EDITOR=: VISUAL=: unset GIT_EDITOR
@@ -58,12 +62,14 @@ esac # 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
@@ -91,6 +97,9 @@ done 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
@@ -101,6 +110,7 @@ if test -n "$color"; then shift echo "* $*" tput sgr0 + ) } else say_color() {
--
1.5.4.3.587.g0bdd73