mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
t5564: fix test hang under zsh's sh mode
This test starts a SOCKS server in Perl in the background and then kills it after the tests are done. However, when using zsh (in sh mode) in the tests, the start_socks function hangs until the background process is killed. Note that this does not reproduce in a simple shell script, so there is likely some interaction between job handling, our heavy use of eval in the test framework, and possibly other complexities of our test framework. What is clear, however, is that switching from a compound statement to a subshell fixes the problem entirely and the test passes with no problem, so do that. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
bf25fca31c
commit
a92f243a94
@@ -40,10 +40,10 @@ test_expect_success 'clone can prompt for proxy password' '
|
||||
|
||||
start_socks() {
|
||||
mkfifo socks_output &&
|
||||
{
|
||||
(
|
||||
"$PERL_PATH" "$TEST_DIRECTORY/socks4-proxy.pl" "$1" >socks_output &
|
||||
echo $! > "$TRASH_DIRECTORY/socks.pid"
|
||||
} &&
|
||||
) &&
|
||||
read line <socks_output &&
|
||||
test "$line" = ready
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user