Merge branch 'maint'

diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index 5e81a259426665c69b77c31ea6cdf13ffd2bb9e8..ef2d01f36939199f9720faad06d2b3a01c7cd7f5 100644 (file)
--- a/t/lib-git-daemon.sh
+++ b/t/lib-git-daemon.sh
@@ -23,12 +23,27 @@ start_git_daemon() {
        trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
 
        say >&3 "Starting git daemon ..."
+       mkfifo git_daemon_output
        git daemon --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
                --reuseaddr --verbose \
                --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
                "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
-               >&3 2>&4 &
+               >&3 2>git_daemon_output &
        GIT_DAEMON_PID=$!
+       {
+               read line
+               echo >&4 "$line"
+               cat >&4 &
+
+               # 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
 }
 
 stop_git_daemon() {
@@ -50,4 +65,5 @@ stop_git_daemon() {
                error "git daemon exited with status: $ret"
        fi
        GIT_DAEMON_PID=
+       rm -f git_daemon_output
 }