summaryrefslogtreecommitdiff
path: root/t/README
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2010-07-02 14:59:47 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-05 11:23:43 -0700
commit97d9fd925bd0db1d11c4fbe8dd919bfb952b2cc1 (patch)
treec74e3cf897ecaf6fbdfb8f1625b09fe4e3120da2 /t/README
parentt/README: Document test_external* (diff)
downloadtgif-97d9fd925bd0db1d11c4fbe8dd919bfb952b2cc1.tar.xz
t/README: Document test_expect_code
test_expect_code (which was introduced in d3bfdb75) never had any documentation. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/README')
-rw-r--r--t/README7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/README b/t/README
index b40403d0c0..04ad927c66 100644
--- a/t/README
+++ b/t/README
@@ -277,6 +277,13 @@ library for your script to use.
Like test_expect_success this function can optionally use a three
argument invocation with a prerequisite as the first argument.
+ - test_expect_code [<prereq>] <code> <message> <script>
+
+ Analogous to test_expect_success, but pass the test if it exits
+ with a given exit <code>
+
+ test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
+
- test_debug <script>
This takes a single argument, <script>, and evaluates it only