summaryrefslogtreecommitdiff
path: root/t/t4202-log.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-10-03 13:39:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-04 02:25:12 (GMT)
commite433749d86c55af27f762c862dbb06d1e108da13 (patch)
tree293e6ee97e225822ceb00646e646d56823b1f087 /t/t4202-log.sh
parent11b087adfd469ca597f1d269314f8cad32d0d72f (diff)
downloadgit-e433749d86c55af27f762c862dbb06d1e108da13.zip
git-e433749d86c55af27f762c862dbb06d1e108da13.tar.gz
git-e433749d86c55af27f762c862dbb06d1e108da13.tar.bz2
test-terminal: set TERM=vt100
The point of the test-terminal script is to simulate in the test scripts an environment where output is going to a real terminal. But since test-lib.sh also sets TERM=dumb, the simulation isn't very realistic. The color code will skip auto-coloring for TERM=dumb, leading to us liberally sprinkling test_terminal env TERM=vt100 git ... through the test suite to convince the tests to actually generate colors. Let's set TERM for programs run under test_terminal, which is one less thing for test-writers to remember. In most cases the callers can be simplified, but note there is one interesting case in t4202. It uses test_terminal to check the auto-enabling of --decorate, but the expected output _doesn't_ contain colors (because TERM=dumb suppresses them). Using TERM=vt100 is closer to what the real world looks like; adjust the expected output to match. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-xt/t4202-log.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 3f3531f..62f9d94 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -750,7 +750,7 @@ test_expect_success 'log.decorate config parsing' '
'
test_expect_success TTY 'log output on a TTY' '
- git log --oneline --decorate >expect.short &&
+ git log --color --oneline --decorate >expect.short &&
test_terminal git log --oneline >actual &&
test_cmp expect.short actual