summaryrefslogtreecommitdiff
path: root/t/README
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-03-22 14:24:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-22 14:24:20 -0700
commit68559c464a8d22d4c3cc0a258fb4317125ddd099 (patch)
tree9c94d5916fc2cf4c40b10b7233ceae933646763f /t/README
parentMerge branch 'rj/sparse-updates' into maint (diff)
parentt: document 'test_must_fail ok=<signal-name>' (diff)
downloadtgif-68559c464a8d22d4c3cc0a258fb4317125ddd099.tar.xz
Merge branch 'sg/doc-test-must-fail-args' into maint
Devdoc update. * sg/doc-test-must-fail-args: t: document 'test_must_fail ok=<signal-name>'
Diffstat (limited to 't/README')
-rw-r--r--t/README14
1 files changed, 12 insertions, 2 deletions
diff --git a/t/README b/t/README
index b3f7b449c3..1a1361a806 100644
--- a/t/README
+++ b/t/README
@@ -655,7 +655,7 @@ library for your script to use.
test_expect_code 1 git merge "merge msg" B master
'
- - test_must_fail <git-command>
+ - test_must_fail [<options>] <git-command>
Run a git command and ensure it fails in a controlled way. Use
this instead of "! <git-command>". When git-command dies due to a
@@ -663,11 +663,21 @@ library for your script to use.
treats it as just another expected failure, which would let such a
bug go unnoticed.
- - test_might_fail <git-command>
+ Accepts the following options:
+
+ ok=<signal-name>[,<...>]:
+ Don't treat an exit caused by the given signal as error.
+ Multiple signals can be specified as a comma separated list.
+ Currently recognized signal names are: sigpipe, success.
+ (Don't use 'success', use 'test_might_fail' instead.)
+
+ - test_might_fail [<options>] <git-command>
Similar to test_must_fail, but tolerate success, too. Use this
instead of "<git-command> || :" to catch failures due to segv.
+ Accepts the same options as test_must_fail.
+
- test_cmp <expected> <actual>
Check whether the content of the <actual> file matches the