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
This commit is contained in:
Junio C Hamano 2021-07-08 13:15:02 -07:00
commit 83ae1edff7

View File

@ -406,14 +406,15 @@ LANG=C
LC_ALL=C LC_ALL=C
PAGER=cat PAGER=cat
TZ=UTC TZ=UTC
export LANG LC_ALL PAGER TZ COLUMNS=80
export LANG LC_ALL PAGER TZ COLUMNS
EDITOR=: EDITOR=:
# A call to "unset" with no arguments causes at least Solaris 10 # 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 # /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets
# deriving from the command substitution clustered with the other # deriving from the command substitution clustered with the other
# ones. # ones.
unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e '
my @env = keys %ENV; my @env = keys %ENV;
my $ok = join("|", qw( my $ok = join("|", qw(
TRACE TRACE