git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 5/7] t/t4016-diff-quote: change from skip_all=* to prereq skip
Date: Wed, 11 Aug 2010 19:04:08 +0000	[thread overview]
Message-ID: <1281553450-26467-6-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <7vd3tpxao1.fsf@alter.siamese.dyndns.org>

Change this test to skip test with test prerequisites, and to do setup
work in tests. This improves the skipped statistics on platforms where
the test isn't run.

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

diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 34e5144..ab0c2f0 100755
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -13,12 +13,14 @@ P1='pathname	with HT'
 P2='pathname with SP'
 P3='pathname
 with LF'
-: 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1" || {
-	skip_all='Your filesystem does not allow tabs in filenames, test skipped.'
-	test_done
-}
+if : 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1"
+then
+	test_set_prereq TABS_IN_FILENAMES
+else
+	say 'Your filesystem does not allow tabs in filenames'
+fi
 
-test_expect_success setup '
+test_expect_success TABS_IN_FILENAMES setup '
 	echo P0.0 >"$P0.0" &&
 	echo P0.1 >"$P0.1" &&
 	echo P0.2 >"$P0.2" &&
@@ -38,6 +40,7 @@ test_expect_success setup '
 	:
 '
 
+test_expect_success TABS_IN_FILENAMES 'setup expected files' '
 cat >expect <<\EOF
  rename pathname.1 => "Rpathname\twith HT.0" (100%)
  rename pathname.3 => "Rpathname\nwith LF.0" (100%)
@@ -47,11 +50,14 @@ cat >expect <<\EOF
  rename pathname.0 => Rpathname.0 (100%)
  rename "pathname\twith HT.0" => Rpathname.1 (100%)
 EOF
-test_expect_success 'git diff --summary -M HEAD' '
+'
+
+test_expect_success TABS_IN_FILENAMES 'git diff --summary -M HEAD' '
 	git diff --summary -M HEAD >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success TABS_IN_FILENAMES 'setup expected files' '
 cat >expect <<\EOF
  pathname.1 => "Rpathname\twith HT.0"            |    0
  pathname.3 => "Rpathname\nwith LF.0"            |    0
@@ -62,7 +68,9 @@ cat >expect <<\EOF
  "pathname\twith HT.0" => Rpathname.1            |    0
  7 files changed, 0 insertions(+), 0 deletions(-)
 EOF
-test_expect_success 'git diff --stat -M HEAD' '
+'
+
+test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '
 	git diff --stat -M HEAD >actual &&
 	test_cmp expect actual
 '
-- 
1.7.2.1.295.gdf931

  parent reply	other threads:[~2010-08-11 19:04 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-10 19:52 [PATCH 0/7] tests: use skip_all=* to skip tests Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 1/7] t/t1304-default-acl: change from skip_all=* to prereq skip Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 2/7] t/t5705-clone-2gb: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32   ` Junio C Hamano
2010-08-10 19:52 ` [PATCH 3/7] t/t7005-editor: " Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 4/7] t/t5503-tagfollow: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32   ` Junio C Hamano
2010-08-11 18:47     ` Ævar Arnfjörð Bjarmason
2010-08-12 17:23       ` Junio C Hamano
2010-08-11 20:20     ` Johannes Sixt
2010-08-10 19:52 ` [PATCH 5/7] t/t4016-diff-quote: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32   ` Junio C Hamano
2010-08-10 19:52 ` [PATCH 6/7] t/t3902-quoted: " Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 7/7] t/t3300-funny-names: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32 ` [PATCH 0/7] tests: use skip_all=* to skip tests Junio C Hamano
2010-08-11 19:04   ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2010-08-12  6:22     ` case where diff output needs improving? (was Re: [PATCH v2 0/7] tests: use skip_all=* to skip tests) Raja R Harinath
2010-08-12  6:43       ` Ævar Arnfjörð Bjarmason
2010-08-11 19:04   ` [PATCH v2 1/7] t/t1304-default-acl: change from skip_all=* to prereq skip Ævar Arnfjörð Bjarmason
2010-08-11 19:04   ` [PATCH v2 2/7] t/t5705-clone-2gb: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04   ` [PATCH v2 3/7] t/t7005-editor: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04   ` [PATCH v2 4/7] t/t5503-tagfollow: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04   ` Ævar Arnfjörð Bjarmason [this message]
2010-08-11 19:04   ` [PATCH v2 6/7] t/t3902-quoted: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04   ` [PATCH v2 7/7] t/t3300-funny-names: " Ævar Arnfjörð Bjarmason

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=1281553450-26467-6-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).