{fetch,upload}-pack: support filter in protocol v2

diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index e7f27ebbc1748df28b6e686b5732c8af18cea7c9..4c214bd11c48859f0c4e64dbbe2d783e744eb1d1 100755 (executable)
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -10,20 +10,21 @@ one
 EOF
 
 test_expect_success 'sigchain works' '
-       { test-sigchain >actual; ret=$?; } &&
-       case "$ret" in
-       143) true ;; # POSIX w/ SIGTERM=15
-       271) true ;; # ksh w/ SIGTERM=15
-         3) true ;; # Windows
-         *) false ;;
-       esac &&
+       { test-tool sigchain >actual; ret=$?; } &&
+       {
+               # Signal death by raise() on Windows acts like exit(3),
+               # regardless of the signal number. So we must allow that
+               # as well as the normal signal check.
+               test_match_signal 15 "$ret" ||
+               test "$ret" = 3
+       } &&
        test_cmp expect actual
 '
 
 test_expect_success !MINGW 'signals are propagated using shell convention' '
        # we use exec here to avoid any sub-shell interpretation
        # of the exit code
-       git config alias.sigterm "!exec test-sigchain" &&
+       git config alias.sigterm "!exec test-tool sigchain" &&
        test_expect_code 143 git sigterm
 '
 
@@ -35,18 +36,18 @@ large_git () {
 }
 
 test_expect_success 'create blob' '
-       test-genrandom foo 16384 >file &&
+       test-tool genrandom foo 16384 >file &&
        git add file
 '
 
 test_expect_success !MINGW 'a constipated git dies with SIGPIPE' '
        OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) &&
-       test "$OUT" -eq 141
+       test_match_signal 13 "$OUT"
 '
 
 test_expect_success !MINGW 'a constipated git dies with SIGPIPE even if parent ignores it' '
        OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) &&
-       test "$OUT" -eq 141
+       test_match_signal 13 "$OUT"
 '
 
 test_done