git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adam Spiers <git@adamspiers.org>
To: git list <git@vger.kernel.org>
Subject: [PATCH v2 1/5] t0008: remove duplicated test fixture data
Date: Thu, 11 Apr 2013 13:05:09 +0100	[thread overview]
Message-ID: <1365681913-7059-1-git-send-email-git@adamspiers.org> (raw)
In-Reply-To: <20130411110511.GB24296@pacific.linksys.moosehall>

The expected contents of STDOUT for the final --stdin tests can be
derived from the expected contents of STDOUT for the same tests when
--verbose is given, in the same way that test_expect_success_multi
derives this for earlier tests.

Signed-off-by: Adam Spiers <git@adamspiers.org>
---
 t/t0008-ignores.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 9c1bde1..314a86d 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -575,21 +575,6 @@ cat <<-\EOF >stdin
 	b/globaltwo
 	../b/globaltwo
 EOF
-cat <<-\EOF >expected-default
-	../one
-	one
-	b/on
-	b/one
-	b/one one
-	b/one two
-	"b/one\"three"
-	b/two
-	b/twooo
-	../globaltwo
-	globaltwo
-	b/globaltwo
-	../b/globaltwo
-EOF
 cat <<-EOF >expected-verbose
 	.gitignore:1:one	../one
 	.gitignore:1:one	one
@@ -605,6 +590,7 @@ cat <<-EOF >expected-verbose
 	$global_excludes:2:!globaltwo	b/globaltwo
 	$global_excludes:2:!globaltwo	../b/globaltwo
 EOF
+sed -e 's/.*	//' expected-verbose >expected-default
 
 sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
 	tr "\n" "\0" >stdin0
-- 
1.8.2.1.342.gfa7285d

  reply	other threads:[~2013-04-11 12:05 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-08 18:13 RFC: two minor tweaks to check-ignore to help git-annex assistant Adam Spiers
2013-04-08 21:56 ` Junio C Hamano
2013-04-08 22:20 ` Jeff King
2013-04-11  1:59 ` [PATCH 1/5] check-ignore: move setup into cmd_check_ignore() Adam Spiers
2013-04-11  1:59   ` [PATCH 2/5] check-ignore: allow incremental streaming of queries via --stdin Adam Spiers
2013-04-11  5:31     ` Jeff King
2013-04-11 10:55       ` Adam Spiers
2013-04-11 11:20     ` Adam Spiers
2013-04-11 18:33       ` Jeff King
2013-04-11  1:59   ` [PATCH 3/5] Documentation: add caveats about I/O buffering for check-{attr,ignore} Adam Spiers
2013-04-11  5:31     ` Jeff King
2013-04-11  1:59   ` [PATCH 4/5] t0008: remove duplicated test fixture data Adam Spiers
2013-04-11  1:59   ` [PATCH 5/5] check-ignore: add -n / --non-matching option Adam Spiers
2013-04-11  5:25   ` [PATCH 1/5] check-ignore: move setup into cmd_check_ignore() Jeff King
2013-04-11 11:05     ` Adam Spiers
2013-04-11 12:05       ` Adam Spiers [this message]
2013-04-11 12:05         ` [PATCH v2 2/5] check-ignore: add -n / --non-matching option Adam Spiers
2013-04-11 12:05         ` [PATCH v2 3/5] check-ignore: move setup into cmd_check_ignore() Adam Spiers
2013-04-11 12:05         ` [PATCH v2 4/5] check-ignore: allow incremental streaming of queries via --stdin Adam Spiers
2013-04-11 19:11           ` Jeff King
2013-04-11 20:31             ` Adam Spiers
2013-04-11 20:40               ` Jeff King
2013-04-22 18:03               ` Junio C Hamano
2013-04-24  8:02                 ` Adam Spiers
2013-04-29 22:55                   ` [PATCH] t0008: use named pipe (FIFO) to test check-ignore streaming Adam Spiers
2013-04-11 21:04           ` [PATCH v2 4/5] check-ignore: allow incremental streaming of queries via --stdin Aaron Schrab
2013-04-11 22:55             ` Adam Spiers
2013-04-11 12:05         ` [PATCH v2 5/5] Documentation: add caveats about I/O buffering for check-{attr,ignore} Adam Spiers
2013-04-11 18:09           ` Junio C Hamano
2013-04-11 20:12             ` [PATCH v3 " Adam Spiers
2013-04-12  2:12               ` Junio C Hamano
2013-04-12 11:00                 ` Adam Spiers
2013-04-11 18:35       ` [PATCH 1/5] check-ignore: move setup into cmd_check_ignore() 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=1365681913-7059-1-git-send-email-git@adamspiers.org \
    --to=git@adamspiers.org \
    --cc=git@vger.kernel.org \
    /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).