[PATCH] test-lib: limit the output of the yes utility
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Feb 2, 2016, 07:28 UTC
- Message-ID
- <56B05A95.3000808@kdbg.org>
On Windows, there is no SIGPIPE. A consequence of this is that the upstream process of a pipe does not notice the death of the downstream process until the pipe buffer is full and writing more data returns an error. This behavior is the reason for an annoying delay during the execution of t7610-mergetool.sh: There are a number of test cases where 'yes' is invoked upstream. Since the utility is basically an endless loop it runs, on Windows, until the pipe buffer is full. This does take a few seconds.
The test suite has its own implementation of 'yes'. Modify it to produce only a limited amount of output that is sufficient for the test suite. The amount chosen should be sufficiently high for any test case, assuming that future test cases will not exaggerate their demands of input from an upstream 'yes' invocation.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- This does not fix an error, but only an unnecessary sink of CPU cycles and wasted wall clock time.
t/test-lib.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh index bd4b02e..97e6491 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -902,15 +902,15 @@ fi yes () { if test $# = 0 then - y=y + set -- y else - y="$*" + set -- "$*" fi - - while echo "$y" - do - : - done + # we do not need an infinite supply of output for tests + set -- "$@" "$@" "$@" "$@" # 4 + set -- "$@" "$@" "$@" "$@" # 16 + set -- "$@" "$@" "$@" "$@" # 64 + printf "%s\n" "$@" } # Fix some commands on Windows
-- 2.7.0.118.g90056ae