diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:17:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:17:17 -0700 |
| commit | 6a88021e4675b69b927ce1aa9c4dddc5dc621232 (patch) | |
| tree | f5d564c698d87857c31909c714df3a67365c06b0 | |
| parent | Merge branch 'jk/maint-config-bogus-section' into maint (diff) | |
| parent | t5570: fix forwarding of git-daemon messages via cat (diff) | |
| download | git-6a88021e4675b69b927ce1aa9c4dddc5dc621232.tar.gz git-6a88021e4675b69b927ce1aa9c4dddc5dc621232.zip | |
Merge branch 'js/daemon-test-race-fix' into maint
The test scaffolding for git-daemon was flaky.
By Johannes Sixt
* js/daemon-test-race-fix:
t5570: fix forwarding of git-daemon messages via cat
| -rw-r--r-- | t/lib-git-daemon.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh index ef2d01f369..87f0ad8f41 100644 --- a/t/lib-git-daemon.sh +++ b/t/lib-git-daemon.sh @@ -31,19 +31,19 @@ start_git_daemon() { >&3 2>git_daemon_output & GIT_DAEMON_PID=$! { - read line + read line <&7 echo >&4 "$line" - cat >&4 & + cat <&7 >&4 & + } 7<git_daemon_output && - # Check expected output - if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble" - then - kill "$GIT_DAEMON_PID" - wait "$GIT_DAEMON_PID" - trap 'die' EXIT - error "git daemon failed to start" - fi - } <git_daemon_output + # Check expected output + if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble" + then + kill "$GIT_DAEMON_PID" + wait "$GIT_DAEMON_PID" + trap 'die' EXIT + error "git daemon failed to start" + fi } stop_git_daemon() { |