diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:53 -0700 |
| commit | 85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba (patch) | |
| tree | 34e21522ba0d2782fd2bdb4eea7182e33ad7455b | |
| parent | Merge branch 'jk/doc-asciidoc-inline-literal' (diff) | |
| parent | test-lib: skip test with COLUMNS=1 under mksh (diff) | |
| download | tgif-85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba.tar.xz | |
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
| -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 b7d7100c4e..9e2b71132a 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 |