git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, jrnieder@gmail.com
Subject: Re: [PATCHv6 01/16] test-lib: make test_expect_code a test command
Date: Mon, 4 Oct 2010 03:37:16 +0000	[thread overview]
Message-ID: <AANLkTi=4_KN858sfXy59xgUSTCtj9ZkvW3+MrX3w3wWg@mail.gmail.com> (raw)
In-Reply-To: <1286136014-7728-2-git-send-email-newren@gmail.com>

On Sun, Oct 3, 2010 at 19:59, Elijah Newren <newren@gmail.com> wrote:
> From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>
> Change test_expect_code to be a normal test command instead of a
> top-level command.

> [...]

> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Acked-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  t/README                |   16 +++++++------
>  t/t0000-basic.sh        |   55 ++++++++++++++++++++++++++++++++++++++--------
>  t/t1504-ceiling-dirs.sh |    5 ++-
>  t/t6020-merge-df.sh     |    4 ++-
>  t/test-lib.sh           |   40 ++++++++++++++++++---------------
>  5 files changed, 82 insertions(+), 38 deletions(-)

This doc change looks. Here's the diff against my patch for reference:

    diff --git a/t/README b/t/README
    index c216e8c..ee4c0cf 100644
    --- a/t/README
    +++ b/t/README
    @@ -475,10 +475,10 @@ library for your script to use.
                'Perl API' \
                "$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl

    - - test_expect_code <exit-code> <git-command>
    + - test_expect_code <exit-code> <command>

    -   Run a git command and ensure that it exits with the given exit
    -   code. For example:
    +   Run a command and ensure that it exits with the given exit code.
    +   For example:

            test_expect_success 'Merge with d/f conflicts' '
                    test_expect_code 1 git merge "merge msg" B master

  parent reply	other threads:[~2010-10-04  3:37 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-03 19:59 [PATCHv6 00/16] Add missing &&'s in the testsuite Elijah Newren
2010-10-03 19:59 ` [PATCHv6 01/16] test-lib: make test_expect_code a test command Elijah Newren
2010-10-04  0:54   ` Junio C Hamano
2010-10-04  3:48     ` Ævar Arnfjörð Bjarmason
2010-10-04  3:50       ` Jonathan Nieder
2010-10-04  4:04         ` Ævar Arnfjörð Bjarmason
2010-10-04  4:06           ` Jonathan Nieder
2010-10-04  6:57             ` Ævar Arnfjörð Bjarmason
2010-10-04  9:28               ` Jonathan Nieder
2010-10-04  3:37   ` Ævar Arnfjörð Bjarmason [this message]
2010-10-03 20:00 ` [PATCHv6 02/16] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-10-04  0:56   ` Junio C Hamano
2010-10-03 20:00 ` [PATCHv6 03/16] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-10-03 20:00 ` [PATCHv6 04/16] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-10-03 20:00 ` [PATCHv6 05/16] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-10-03 20:00 ` [PATCHv6 06/16] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-10-03 20:00 ` [PATCHv6 07/16] t3600 (rm): add lots of missing && Elijah Newren
2010-10-03 20:56   ` Jonathan Nieder
2010-10-03 23:32     ` Junio C Hamano
2010-10-03 20:00 ` [PATCHv6 08/16] t4019 (diff-wserror): " Elijah Newren
2010-10-03 20:00 ` [PATCHv6 09/16] t4026 (color): remove unneeded and unchained command Elijah Newren
2010-10-03 20:00 ` [PATCHv6 10/16] t5602 (clone-remote-exec): add missing && Elijah Newren
2010-10-03 20:00 ` [PATCHv6 11/16] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-10-03 20:00 ` [PATCHv6 12/16] t7001 (mv): " Elijah Newren
2010-10-03 20:00 ` [PATCHv6 13/16] t7601 (merge-pull-config): " Elijah Newren
2010-10-03 20:00 ` [PATCHv6 14/16] t7800 (difftool): " Elijah Newren
2010-10-03 20:00 ` [PATCHv6 15/16] Add missing &&'s throughout the testsuite Elijah Newren
2010-10-03 20:59   ` Jonathan Nieder
2010-10-03 21:17   ` Jonathan Nieder
2010-10-31  1:46   ` [PATCH en/cascade-tests] tests: add missing && Jonathan Nieder
2010-10-31  3:31     ` Junio C Hamano
2010-10-31  7:26       ` [PATCH/RFC 00/10] " Jonathan Nieder
2010-10-31  7:30         ` [PATCH 01/10] tests: add missing &&, batch 2 Jonathan Nieder
2010-10-31  7:33         ` [RFC/PATCH 02/10] test-lib: introduce test_line_count to measure files Jonathan Nieder
2010-11-09 22:56           ` Junio C Hamano
2010-11-09 23:09           ` Ævar Arnfjörð Bjarmason
2010-10-31  7:34         ` [PATCH 03/10] t6022 (renaming merge): chain test commands with && Jonathan Nieder
2010-10-31  7:35         ` [PATCH 04/10] t1502 (rev-parse --parseopt): test exit code from "-h" Jonathan Nieder
2010-10-31  7:36         ` [PATCH 05/10] t1400 (update-ref): use test_must_fail Jonathan Nieder
2010-10-31  7:36         ` [PATCH 06/10] t3301 (notes): use test_expect_code for clarity Jonathan Nieder
2010-10-31  7:38         ` [PATCH 07/10] t3404 (rebase -i): unroll test_commit loops Jonathan Nieder
2010-10-31  7:39         ` [PATCH 08/10] t3404 (rebase -i): move comment to description Jonathan Nieder
2010-11-17 23:12           ` Junio C Hamano
2010-10-31  7:40         ` [PATCH 09/10] t3404 (rebase -i): introduce helper to check position of HEAD Jonathan Nieder
2010-11-17 17:55           ` Junio C Hamano
2010-10-31  7:41         ` [PATCH 10/10] t4124 (apply --whitespace): use test_might_fail Jonathan Nieder
2010-11-09 22:25       ` [PATCH en/cascade-tests] tests: add missing && Junio C Hamano
2010-11-05  4:57     ` Elijah Newren
2010-10-03 20:00 ` [PATCHv6 16/16] Introduce portable_unset and use it to ensure proper && chaining Elijah Newren
2010-10-04  3:26   ` Ævar Arnfjörð Bjarmason
2010-10-04  4:44     ` Jonathan Nieder
2010-10-04  7:52       ` Junio C Hamano
2010-10-04 11:38         ` Jonathan Nieder
2010-10-03 21:09 ` [PATCHv6 00/16] Add missing &&'s in the testsuite Jonathan Nieder
2010-10-04  3:11 ` Ævar Arnfjörð Bjarmason
2010-10-04  3:44   ` Jonathan Nieder
2010-10-04  3:50     ` Ævar Arnfjörð Bjarmason
2010-10-04 12:28 ` yj2133011
2010-10-06  5:31 ` [TOY PATCH] test-lib: &&-chaining tester Jonathan Nieder
2010-10-06  8:09   ` Matthieu Moy
2010-10-06  8:25     ` Johannes Sixt
2010-10-06  8:52   ` Sverre Rabbelier

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='AANLkTi=4_KN858sfXy59xgUSTCtj9ZkvW3+MrX3w3wWg@mail.gmail.com' \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=newren@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).