diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2014-01-30 08:42:32 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-01-31 09:07:17 -0800 |
| commit | 52c02f658ec07dc32fb43524c9b32b1ea0954f27 (patch) | |
| tree | cd79c35b4cc54eab3b043a41b3b1f84c3b606308 | |
| parent | pager: set LV=-c alongside LESS=FRSX (diff) | |
| download | tgif-52c02f658ec07dc32fb43524c9b32b1ea0954f27.tar.xz | |
pager test: make fake pager consume all its input
Otherwise there is a race: if 'git log' finishes writing before the
pager terminates and closes the pipe, all is well, and if the pager
finishes quickly enough then 'git log' terminates with SIGPIPE.
died of signal 13 at /build/buildd/git-1.9~rc1/t/test-terminal.perl line 33.
not ok 6 - LESS and LV envvars are set for pagination
Noticed on Ubuntu PPA builders, where the race was lost about half the
time. Compare v1.7.0.2~6^2 (tests: Fix race condition in t7006-pager,
2010-02-22).
Reported-by: Anders Kaseorg <andersk@MIT.EDU>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7006-pager.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 7fe3367b6b..b9365b431d 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -40,7 +40,7 @@ test_expect_failure TTY 'pager runs from subdir' ' test_expect_success TTY 'LESS and LV envvars are set for pagination' ' ( sane_unset LESS LV && - PAGER="env >pager-env.out" && + PAGER="env >pager-env.out; wc" && export PAGER && test_terminal git log |