t/lib-httpd: require SANITY prereq

diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index 5e81a259426665c69b77c31ea6cdf13ffd2bb9e8..394b06b32f838463221e9c2f49380fd9eb08bb9d 100644 (file)
--- a/t/lib-git-daemon.sh
+++ b/t/lib-git-daemon.sh
@@ -1,4 +1,20 @@
-#!/bin/sh
+# Shell library to run git-daemon in tests.  Ends the test early if
+# GIT_TEST_GIT_DAEMON is not set.
+#
+# Usage:
+#
+#      . ./test-lib.sh
+#      . "$TEST_DIRECTORY"/lib-git-daemon.sh
+#      start_git_daemon
+#
+#      test_expect_success '...' '
+#              ...
+#      '
+#
+#      test_expect_success ...
+#
+#      stop_git_daemon
+#      test_done
 
 if test -z "$GIT_TEST_GIT_DAEMON"
 then
@@ -23,12 +39,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 <&7
+               echo >&4 "$line"
+               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
 }
 
 stop_git_daemon() {
@@ -50,4 +81,5 @@ stop_git_daemon() {
                error "git daemon exited with status: $ret"
        fi
        GIT_DAEMON_PID=
+       rm -f git_daemon_output
 }