diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-09 07:54:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-09 07:54:54 +0900 |
| commit | fe0e6ffa1998ad28e8362420a20e5fd655dcd569 (patch) | |
| tree | 433eff7402bf85f7c4abde2a41a5ff6222a28f01 /t | |
| parent | c64b234a0bcff8b616eb658a4a245f8a25cb2bac (diff) | |
| parent | a92f243a94e6810394fb01d517726487252007f0 (diff) | |
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_count
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0614-reftable-fsck.sh | 2 | ||||
| -rwxr-xr-x | t/t5564-http-proxy.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t0614-reftable-fsck.sh b/t/t0614-reftable-fsck.sh index 85cc47d67e..677eb9143c 100755 --- a/t/t0614-reftable-fsck.sh +++ b/t/t0614-reftable-fsck.sh @@ -20,7 +20,7 @@ test_expect_success "no errors reported on a well formed repository" ' done && # 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 && test_must_be_empty err diff --git a/t/t5564-http-proxy.sh b/t/t5564-http-proxy.sh index c3903faf2d..3bcbdef409 100755 --- a/t/t5564-http-proxy.sh +++ b/t/t5564-http-proxy.sh @@ -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 } |