diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:03 -0700 |
| commit | 83ae1edff7ee0b7674bd556955d2cf1706bddb21 (patch) | |
| tree | 53adb04bd2575623bb34cd9f31258f8e8be6e15a /t/test-lib.sh | |
| parent | 018b85dead99d968b8e66e0ee6b74358a74015d6 (diff) | |
| parent | c49a177beca2f03f205437a3fa8c52e2011bd581 (diff) | |
| download | git-83ae1edff7ee0b7674bd556955d2cf1706bddb21.tar.gz | |
Merge branch 'ab/fix-columns-to-80-during-tests'
Output from some of our tests were affected by the width of the
terminal that they were run in, which has been corrected by
exporting a fixed value in the COLUMNS environment.
* ab/fix-columns-to-80-during-tests:
test-lib.sh: set COLUMNS=80 for --verbose repeatability
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index a7badbf1dd..7036f83b33 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -406,14 +406,15 @@ LANG=C LC_ALL=C PAGER=cat TZ=UTC -export LANG LC_ALL PAGER TZ +COLUMNS=80 +export LANG LC_ALL PAGER TZ COLUMNS EDITOR=: # 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_PATH" -e ' +unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e ' my @env = keys %ENV; my $ok = join("|", qw( TRACE |