From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 May 2012 20:51:53 +0000 (-0700)
Subject: Merge branch 'zj/mksh-columns-breakage'
X-Git-Tag: v1.7.11-rc0~72
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba?hp=-c

Merge branch 'zj/mksh-columns-breakage'

A broken shell may not let us set an environment value to an arbitrary
value, interfering with some of the tests. Introduce a test prerequisite
so that we can skip some tests on such a platform.

By Zbigniew Jędrzejewski-Szmek
* zj/mksh-columns-breakage:
test-lib: skip test with COLUMNS=1 under mksh
---

85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba
diff --combined t/test-lib.sh
index b7d7100c4e,50a01b1c1d..9e2b71132a
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -42,11 -42,10 +42,11 @@@ TZ=UT
  TERM=dumb
  export LANG LC_ALL PAGER TERM TZ
  EDITOR=:
 -unset VISUAL
 -unset EMAIL
 -unset LANGUAGE
 -unset $(perl -e '
 +# A call to "unset" with no arguments causes at least Solaris 10
 +# /usr/xpg4/bin/sh and /bin/ksh to bail out.  So keep the unsets
 +# deriving from the command substitution clustered with the other
 +# ones.
 +unset VISUAL EMAIL LANGUAGE COLUMNS $(perl -e '
  	my @env = keys %ENV;
  	my $ok = join("|", qw(
  		TRACE
@@@ -615,6 -614,7 +615,7 @@@ case $(uname -s) i
  	;;
  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