freshlybakedca.ke
Git fork
Merge branch 'js/daemon-test-race-fix'
The shell construct to launch git-daemon and wait for it to start
serving during the test was faulty, and this fixes it.
By Johannes Sixt
* js/daemon-test-race-fix:
t5570: fix forwarding of git-daemon messages via cat
+11
-11
+11
-11
t/lib-git-daemon.sh
+11
-11
t/lib-git-daemon.sh
···
31
31
>&3 2>git_daemon_output &
32
32
GIT_DAEMON_PID=$!
33
33
{
34
-
read line
34
+
read line <&7
35
35
echo >&4 "$line"
36
-
cat >&4 &
36
+
cat <&7 >&4 &
37
+
} 7<git_daemon_output &&
37
38
38
-
# Check expected output
39
-
if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
40
-
then
41
-
kill "$GIT_DAEMON_PID"
42
-
wait "$GIT_DAEMON_PID"
43
-
trap 'die' EXIT
44
-
error "git daemon failed to start"
45
-
fi
46
-
} <git_daemon_output
39
+
# Check expected output
40
+
if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
41
+
then
42
+
kill "$GIT_DAEMON_PID"
43
+
wait "$GIT_DAEMON_PID"
44
+
trap 'die' EXIT
45
+
error "git daemon failed to start"
46
+
fi
47
47
}
48
48
49
49
stop_git_daemon() {