diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:55 -0800 |
| commit | 9462ac7211492ace965b6b51bf8060f01d829f2d (patch) | |
| tree | 7998dfb82b5327f5f96b0b1f0cf5ead27be65a6a /t/lib-git-daemon.sh | |
| parent | Merge branch 'jk/dev-build-format-security' (diff) | |
| parent | Revert "t/lib-git-daemon: record daemon log" (diff) | |
| download | git-9462ac7211492ace965b6b51bf8060f01d829f2d.tar.gz git-9462ac7211492ace965b6b51bf8060f01d829f2d.zip | |
Merge branch 'tg/t5570-drop-racy-test'
An inherently racy test that caused intermittent failures has been
removed.
* tg/t5570-drop-racy-test:
Revert "t/lib-git-daemon: record daemon log"
t5570: drop racy test
Diffstat (limited to 't/lib-git-daemon.sh')
| -rw-r--r-- | t/lib-git-daemon.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh index f98de95c15..fd41229a8f 100644 --- a/t/lib-git-daemon.sh +++ b/t/lib-git-daemon.sh @@ -54,19 +54,11 @@ start_git_daemon() { "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ >&3 2>git_daemon_output & GIT_DAEMON_PID=$! - >daemon.log { read -r line <&7 - printf "%s\n" "$line" - printf >&4 "%s\n" "$line" - ( - while read -r line <&7 - do - printf "%s\n" "$line" - printf >&4 "%s\n" "$line" - done - ) & - } 7<git_daemon_output >>"$TRASH_DIRECTORY/daemon.log" && + printf "%s\n" "$line" >&4 + cat <&7 >&4 & + } 7<git_daemon_output && # Check expected output if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble" |