From: Junio C Hamano <gitster@pobox•com>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: git@vger•kernel.org, sunshine@sunshineco•com, jrnieder@gmail•com,
peff@peff•net
Subject: Re: [PATCH v5 3/9] tests: new test for orderfile options
Date: Thu, 24 Apr 2014 11:45:35 -0700 [thread overview]
Message-ID: <xmqqoazqva5s.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1398331809-11309-3-git-send-email-mst@redhat.com> (Michael S. Tsirkin's message of "Thu, 24 Apr 2014 12:30:57 +0300")
"Michael S. Tsirkin" <mst@redhat•com> writes:
> The test is very basic and can be extended.
> Couldn't find a good existing place to put it,
> so created a new file.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat•com>
> ---
> t/t4056-diff-order.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 63 insertions(+)
> create mode 100755 t/t4056-diff-order.sh
>
> diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
> new file mode 100755
> index 0000000..0404f50
Huh? What codebase is this based on?
I think we had t4056 since b5277730 (t4056: add new tests for "git
diff -O", 2013-12-18).
Puzzled...
> --- /dev/null
> +++ b/t/t4056-diff-order.sh
> @@ -0,0 +1,63 @@
> +#!/bin/sh
> +
> +test_description='diff orderfile'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'setup' '
> + as="a a a a a a a a" && # eight a
> + test_write_lines $as >foo &&
> + test_write_lines $as >bar &&
> + git add foo bar &&
> + git commit -a -m initial &&
> + test_write_lines $as b >foo &&
> + test_write_lines $as b >bar &&
> + git commit -a -m first &&
> + test_write_lines bar foo >bar-then-foo &&
> + test_write_lines foo bar >foo-then-bar &&
> + git diff -Ofoo-then-bar HEAD~1..HEAD >diff-foo-then-bar &&
> + git diff -Obar-then-foo HEAD~1..HEAD >diff-bar-then-foo
> +'
> +
> +test_diff_well_formed () {
> + grep ^+b "$1" >added
> + grep ^-b "$1" >removed
> + grep ^+++ "$1" >oldfiles
> + grep ^--- "$1" >newfiles
> + test_line_count = 2 added &&
> + test_line_count = 0 removed &&
> + test_line_count = 2 oldfiles &&
> + test_line_count = 2 newfiles
> +}
> +
> +test_expect_success 'diff output with -O is well-formed' '
> + test_diff_well_formed diff-foo-then-bar &&
> + test_diff_well_formed diff-bar-then-foo
> +'
> +
> +test_expect_success 'flag -O affects diff output' '
> + ! test_cmp diff-foo-then-bar diff-bar-then-foo
> +'
> +
> +test_expect_success 'orderfile is same as -O' '
> + test_config diff.orderfile foo-then-bar &&
> + git diff HEAD~1..HEAD >diff-foo-then-bar-config &&
> + test_config diff.orderfile bar-then-foo &&
> + git diff HEAD~1..HEAD >diff-bar-then-foo-config &&
> + test_cmp diff-foo-then-bar diff-foo-then-bar-config &&
> + test_cmp diff-bar-then-foo diff-bar-then-foo-config
> +'
> +
> +test_expect_success '-O overrides orderfile' '
> + test_config diff.orderfile foo-then-bar &&
> + git diff -Obar-then-foo HEAD~1..HEAD >diff-bar-then-foo-flag &&
> + test_cmp diff-bar-then-foo diff-bar-then-foo-flag
> +'
> +
> +test_expect_success '/dev/null is same as no orderfile' '
> + git diff -O/dev/null HEAD~1..HEAD>diff-null-orderfile &&
> + git diff HEAD~1..HEAD >diff-default &&
> + test_cmp diff-null-orderfile diff-default
> +'
> +
> +test_done
next prev parent reply other threads:[~2014-04-24 18:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 9:30 [PATCH v5 1/9] diff: add a config option to control orderfile Michael S. Tsirkin
2014-04-24 9:30 ` [PATCH v5 2/9] test: add test_write_lines helper Michael S. Tsirkin
2014-04-24 17:08 ` Jonathan Nieder
2014-04-24 18:31 ` Junio C Hamano
2014-04-24 9:30 ` [PATCH v5 3/9] tests: new test for orderfile options Michael S. Tsirkin
2014-04-24 17:11 ` Jonathan Nieder
2014-04-24 18:45 ` Junio C Hamano [this message]
2014-04-24 21:39 ` Michael S. Tsirkin
2014-04-24 9:31 ` [PATCH v5 4/9] patch-id: make it stable against hunk reordering Michael S. Tsirkin
2014-04-24 17:30 ` Jonathan Nieder
2014-04-24 19:12 ` Junio C Hamano
2014-04-24 21:32 ` Michael S. Tsirkin
2014-04-24 9:31 ` [PATCH v5 5/9] patch-id: document new behaviour Michael S. Tsirkin
2014-04-24 17:33 ` Jonathan Nieder
2014-04-24 21:26 ` Michael S. Tsirkin
2014-04-24 22:12 ` Junio C Hamano
2014-04-27 18:26 ` Michael S. Tsirkin
2014-04-24 9:31 ` [PATCH v5 6/9] patch-id-test: test stable and unstable behaviour Michael S. Tsirkin
2014-04-24 9:31 ` [PATCH v5 7/9] patch-id: change default to stable Michael S. Tsirkin
2014-04-24 9:31 ` [PATCH v5 8/9] t4204-patch-id.sh: default is now stable Michael S. Tsirkin
2014-04-24 9:31 ` [PATCH v5 9/9] Documentation/git-patch-id.txt: default is stable Michael S. Tsirkin
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=xmqqoazqva5s.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=mst@redhat$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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