All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 6/8] t/README: Document test_expect_code
Date: Thu,  1 Jul 2010 20:17:56 +0000	[thread overview]
Message-ID: <1278015478-6920-7-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1278015478-6920-1-git-send-email-avarab@gmail.com>

test_expect_code (which was introduced in d3bfdb75) never had any
documentation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 t/README |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/t/README b/t/README
index d9b5294..27b9658 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
-- 
1.7.1.251.g92a7

  parent reply	other threads:[~2010-07-01 20:18 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-01 20:17 [PATCH v2 0/8] Improvements for t/README Ævar Arnfjörð Bjarmason
2010-07-01 20:17 ` [PATCH v2 1/8] t/README: Tests are all +x, ./test, not sh ./test Ævar Arnfjörð Bjarmason
2010-07-01 23:54   ` Junio C Hamano
2010-07-02  1:00     ` Ævar Arnfjörð Bjarmason
2010-07-01 20:17 ` [PATCH v2 2/8] t/README: The trash is in 't/trash directory.$name' Ævar Arnfjörð Bjarmason
2010-07-01 20:17 ` [PATCH v2 3/8] t/README: Typo: paralell -> parallel Ævar Arnfjörð Bjarmason
2010-07-01 20:17 ` [PATCH v2 4/8] t/README: Document the prereq functions, and 3-arg test_* Ævar Arnfjörð Bjarmason
2010-07-01 20:17 ` [PATCH v2 5/8] t/README: Document test_external* Ævar Arnfjörð Bjarmason
2010-07-01 20:52   ` Jakub Narebski
2010-07-01 21:18     ` [PATCH v3 " Ævar Arnfjörð Bjarmason
2010-07-01 20:17 ` Ævar Arnfjörð Bjarmason [this message]
2010-07-01 20:17 ` [PATCH v2 7/8] t/README: Add a section about skipping tests Ævar Arnfjörð Bjarmason
2010-07-01 20:17 ` [PATCH v2 8/8] t/README: Document the do's and don'ts of tests Ævar Arnfjörð Bjarmason
2010-07-02  7:28 ` [PATCH v2 0/8] Improvements for t/README Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1278015478-6920-7-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.