Skip to content

Commit e8cbef6

Browse files
committed
Merge branch 'ab/fix-columns-to-80-during-tests' into next
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
2 parents 02ca61e + c49a177 commit e8cbef6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

t/test-lib.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,14 +406,15 @@ LANG=C
406406
LC_ALL=C
407407
PAGER=cat
408408
TZ=UTC
409-
export LANG LC_ALL PAGER TZ
409+
COLUMNS=80
410+
export LANG LC_ALL PAGER TZ COLUMNS
410411
EDITOR=:
411412

412413
# A call to "unset" with no arguments causes at least Solaris 10
413414
# /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets
414415
# deriving from the command substitution clustered with the other
415416
# ones.
416-
unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
417+
unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e '
417418
my @env = keys %ENV;
418419
my $ok = join("|", qw(
419420
TRACE

0 commit comments

Comments
 (0)