diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-26 17:32:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 17:32:25 (GMT) |
| commit | 7eacc2bc29cc810fd5722096aa3c2c9dc8db34ab (patch) | |
| tree | c7848640dfe346b9900c25d3051545a92c68a4ae /t/test-lib.sh | |
| parent | 8784e4dddeb16a89dd19bfb879788b8df0aac1f5 (diff) | |
| parent | f143d9c695cd4c3e86069c536fa0dff04fc93e93 (diff) | |
| download | git-7eacc2bc29cc810fd5722096aa3c2c9dc8db34ab.zip git-7eacc2bc29cc810fd5722096aa3c2c9dc8db34ab.tar.gz git-7eacc2bc29cc810fd5722096aa3c2c9dc8db34ab.tar.bz2 | |
Merge branch 'jn/userdiff-perl-updates'
* jn/userdiff-perl-updates:
userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
tests: make test_expect_code quieter on success
userdiff/perl: catch sub with brace on second line
userdiff/perl: match full line of POD headers
userdiff/perl: anchor "sub" and "package" patterns on the left
t4018 (funcname patterns): minor cleanups
t4018 (funcname patterns): make configuration easier to track
t4018 (funcname patterns): make .gitattributes state easier to track
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index b2ce2bc..b12b993 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -731,12 +731,11 @@ test_expect_code () { exit_code=$? if test $exit_code = $want_code then - echo >&2 "test_expect_code: command exited with $exit_code: $*" return 0 - else - echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*" - return 1 fi + + echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*" + return 1 } # test_cmp is a helper function to compare actual and expected output. |