summaryrefslogtreecommitdiff
path: root/t/test-lib-functions.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-27 18:33:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-27 18:33:58 (GMT)
commite3eb4050272e790ee9c7d9e08e44b34322387da6 (patch)
treeb85623c202d446d2dbcc01b2d5e55295e89dd861 /t/test-lib-functions.sh
parent1ba6846a19b0358ddf4098d44ba5804646c36412 (diff)
parent12e31a6b12b0a8497f35b327219c348186e0a666 (diff)
downloadgit-e3eb4050272e790ee9c7d9e08e44b34322387da6.zip
git-e3eb4050272e790ee9c7d9e08e44b34322387da6.tar.gz
git-e3eb4050272e790ee9c7d9e08e44b34322387da6.tar.bz2
Merge branch 'sg/doc-test-must-fail-args'
Devdoc update. * sg/doc-test-must-fail-args: t: document 'test_must_fail ok=<signal-name>'
Diffstat (limited to 't/test-lib-functions.sh')
-rw-r--r--t/test-lib-functions.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 67b5994..8a8a932 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -610,6 +610,14 @@ list_contains () {
#
# Writing this as "! git checkout ../outerspace" is wrong, because
# the failure could be due to a segv. We want a controlled failure.
+#
+# 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_must_fail () {
case "$1" in
@@ -656,6 +664,8 @@ test_must_fail () {
#
# Writing "git config --unset all.configuration || :" would be wrong,
# because we want to notice if it fails due to segv.
+#
+# Accepts the same options as test_must_fail.
test_might_fail () {
test_must_fail ok=success "$@"