diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 20:51:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 20:51:53 (GMT) |
| commit | 85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba (patch) | |
| tree | 34e21522ba0d2782fd2bdb4eea7182e33ad7455b /t/test-lib.sh | |
| parent | d274fc093cbdcddbf9aff5f79de4e9445f3363d7 (diff) | |
| parent | b082687cbac951d31bdea346404db5d0b99a0b73 (diff) | |
| download | git-85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba.zip git-85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba.tar.gz git-85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba.tar.bz2 | |
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
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index b7d7100..9e2b711 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -615,6 +615,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 |