From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 27 Apr 2012 09:25:25 +0000 (+0200)
Subject: test-lib: skip test with COLUMNS=1 under mksh
X-Git-Tag: v1.7.10.2~20^2~1^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b082687cbac951d31bdea346404db5d0b99a0b73;p=git.git

test-lib: skip test with COLUMNS=1 under mksh

mksh does not allow $COLUMNS to be set below 12.  mksh(1) says that
$COLUMNS is "always set, defaults to 80, unless the value as reported
by stty(1) is non-zero and sane enough". This applies also to setting
it directly for one command:

    $ COLUMNS=10 python -c 'import os; print os.environ["COLUMNS"]'
    98

Add a test prerequisite by checking if we can set COLUMNS=1, to allow
us to skip tests that needs it.

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/test-lib.sh b/t/test-lib.sh
index d75766ada..50a01b1c1 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -614,6 +614,7 @@ case $(uname -s) in
 	;;
 esac
 
+( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
 test -z "$NO_PERL" && test_set_prereq PERL
 test -z "$NO_PYTHON" && test_set_prereq PYTHON
 test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE