test_must_fail: use test_match_signal
authorJeff King <peff@peff.net>
Fri, 24 Jun 2016 19:45:04 +0000 (15:45 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 14:44:25 +0000 (07:44 -0700)
In 8bf4bec (add "ok=sigpipe" to test_must_fail and use it to
fix flaky tests, 2015-11-27), test_must_fail learned to
recognize "141" as a sigpipe failure. However, testing for
a signal is more complicated than that; we should use
test_match_signal to implement more portable checking.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/test-lib-functions.sh
index 15ef3f816c64521628157a5a1d96d42fa5ca8720..ca40a1289f269830e30136459a09fc2526957895 100644 (file)
@@ -612,7 +612,7 @@ test_must_fail () {
        then
                echo >&2 "test_must_fail: command succeeded: $*"
                return 1
-       elif test $exit_code -eq 141 && list_contains "$_test_ok" sigpipe
+       elif test_match_signal 13 $exit_code && list_contains "$_test_ok" sigpipe
        then
                return 0
        elif test $exit_code -gt 129 && test $exit_code -le 192