From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: "SZEDER Gábor" <szeder@ira.uka.de>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"Jeff King" <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [PATCH 3/4] rev-parse test: use test_cmp instead of "test" builtin
Date: Tue, 03 Sep 2013 13:01:13 -0700 [thread overview]
Message-ID: <xmqqk3ixr7xy.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20130903170715.GD29921@google.com> (Jonathan Nieder's message of "Tue, 3 Sep 2013 10:07:15 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Use test_cmp instead of passing two command substitutions to the
> "test" builtin. This way:
>
> - when tests fail, they can print a helpful diff if run with
> "--verbose"
>
> - the argument order "test_cmp expect actual" feels natural,
> unlike test <known> = <unknown> that seems a little backwards
I do not mind to drop s/a little // here, by the way.
> - the exit status from invoking git is checked, so if rev-parse
> starts segfaulting then the test will notice and fail
>
> Use a custom function for this instead of test_cmp_rev to emphasize
> that we are testing the output from "git rev-parse" with certain
> arguments, not checking that the revisions are equal in abstract.
>
> Reported-by: Felipe Contreras <felipe.contreras@gmail.com>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> t/t6101-rev-parse-parents.sh | 33 +++++++++++++++++++--------------
> 1 file changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
> index 416067c..8a6ff66 100755
> --- a/t/t6101-rev-parse-parents.sh
> +++ b/t/t6101-rev-parse-parents.sh
> @@ -8,6 +8,12 @@ test_description='Test git rev-parse with different parent options'
> . ./test-lib.sh
> . "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
>
> +test_cmp_rev_output () {
> + git rev-parse --verify "$1" >expect &&
> + eval "$2" >actual &&
> + test_cmp expect actual
> +}
After applying this patch and running "git show | grep test_cmp_rev_output",
I notice that the second is always "git rev-parse <something>". Do
we still need to eval these, or would it be sufficient to do
test_cmp_rev_output () {
git rev-parse --verify "$1" >expect &&
git rev-parse --verify "$2" >actual &&
test_cmp expect actual
}
here, and make users like so:
- test_cmp_rev_output tags/start "git rev-parse start^0"
+ test_cmp_rev_output tags/start start^0
Am I missing something?
next prev parent reply other threads:[~2013-09-03 20:01 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 6:30 [PATCH 0/4] t: rev-parse-parents: cleanups Felipe Contreras
2013-09-02 6:30 ` [PATCH 1/4] t: rev-parse-parents: fix style Felipe Contreras
2013-09-02 6:30 ` [PATCH 2/4] t: rev-parse-parents: fix weird ! notation Felipe Contreras
2013-09-02 6:30 ` [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions Felipe Contreras
2013-09-03 7:12 ` Jeff King
2013-09-03 7:51 ` SZEDER Gábor
2013-09-03 8:03 ` Jeff King
2013-09-03 10:45 ` Felipe Contreras
2013-09-03 11:10 ` SZEDER Gábor
2013-09-03 13:39 ` Felipe Contreras
2013-09-03 15:08 ` SZEDER Gábor
2013-09-03 17:04 ` [PATCH 0/4] " Jonathan Nieder
2013-09-03 17:05 ` [PATCH 1/4] rev-parse test: modernize quoting and whitespace Jonathan Nieder
2013-09-03 17:06 ` [PATCH 2/4] rev-parse test: use test_must_fail, not "if <command>; then false; fi" Jonathan Nieder
2013-09-03 21:56 ` Felipe Contreras
2013-09-03 17:07 ` [PATCH 3/4] rev-parse test: use test_cmp instead of "test" builtin Jonathan Nieder
2013-09-03 20:01 ` Junio C Hamano [this message]
2013-09-04 4:28 ` Jonathan Nieder
2013-09-03 22:01 ` Felipe Contreras
2013-09-03 17:11 ` [PATCH 4/4] rev-parse test: use standard test functions for setup Jonathan Nieder
2013-09-03 17:15 ` [PATCH v2 " Jonathan Nieder
2013-09-03 17:20 ` [PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions Jeff King
2013-09-03 21:53 ` Felipe Contreras
2013-09-04 16:47 ` Junio C Hamano
2013-09-04 17:13 ` John Keeping
2013-09-04 17:38 ` Junio C Hamano
2013-09-04 18:36 ` Jeff King
2013-09-04 19:14 ` Junio C Hamano
2013-09-08 3:11 ` Felipe Contreras
2013-09-08 4:06 ` Jeff King
2013-09-08 4:13 ` Felipe Contreras
2013-09-08 4:14 ` Felipe Contreras
2013-09-08 4:26 ` Jeff King
2013-09-08 4:52 ` Felipe Contreras
2013-09-08 5:02 ` Jeff King
2013-09-08 23:25 ` Felipe Contreras
2013-09-08 23:45 ` Jeff King
2013-09-09 0:45 ` Felipe Contreras
2013-09-08 18:33 ` Junio C Hamano
2013-09-08 23:18 ` Felipe Contreras
2013-09-08 8:11 ` Philip Oakley
2013-09-03 17:31 ` Junio C Hamano
2013-09-03 17:33 ` Junio C Hamano
2013-09-03 21:52 ` Felipe Contreras
2013-09-02 6:30 ` [PATCH 4/4] t: rev-parse-parents: simplify setup Felipe Contreras
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=xmqqk3ixr7xy.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=szeder@ira.uka.de \
/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.