Merge branch 'bc/zsh-testsuite'
A few tests have been updated to work under the shell compatible mode of zsh. * bc/zsh-testsuite: t5564: fix test hang under zsh's sh mode t0614: use numerical comparison with test_line_countmain
commit
fe0e6ffa19
|
|
@ -20,7 +20,7 @@ test_expect_success "no errors reported on a well formed repository" '
|
||||||
done &&
|
done &&
|
||||||
|
|
||||||
# The repository should end up with multiple tables.
|
# The repository should end up with multiple tables.
|
||||||
test_line_count ">" 1 .git/reftable/tables.list &&
|
test_line_count -gt 1 .git/reftable/tables.list &&
|
||||||
|
|
||||||
git refs verify 2>err &&
|
git refs verify 2>err &&
|
||||||
test_must_be_empty err
|
test_must_be_empty err
|
||||||
|
|
|
||||||
|
|
@ -40,10 +40,10 @@ test_expect_success 'clone can prompt for proxy password' '
|
||||||
|
|
||||||
start_socks() {
|
start_socks() {
|
||||||
mkfifo socks_output &&
|
mkfifo socks_output &&
|
||||||
{
|
(
|
||||||
"$PERL_PATH" "$TEST_DIRECTORY/socks4-proxy.pl" "$1" >socks_output &
|
"$PERL_PATH" "$TEST_DIRECTORY/socks4-proxy.pl" "$1" >socks_output &
|
||||||
echo $! > "$TRASH_DIRECTORY/socks.pid"
|
echo $! > "$TRASH_DIRECTORY/socks.pid"
|
||||||
} &&
|
) &&
|
||||||
read line <socks_output &&
|
read line <socks_output &&
|
||||||
test "$line" = ready
|
test "$line" = ready
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue