git.vger.kernel.org archive mirror
 help / color / mirror / 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 4/6] Turn setup code in t2007-checkout-symlink.sh into a test
Date: Fri,  7 May 2010 19:37:03 +0000	[thread overview]
Message-ID: <1273261025-31523-4-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1273261025-31523-1-git-send-email-avarab@gmail.com>

Previously the test would print to stdout which interfered with the
TAP output. Now this scaffolding code is just a normal test.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 t/t2007-checkout-symlink.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index 616ca2a..05cc8fd 100755
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -44,8 +44,10 @@ test_expect_success 'switch from symlink to dir' '
 
 '
 
-rm -fr frotz xyzzy nitfol &&
-git checkout -f master || exit
+test_expect_success 'Remove temporary directories & switch to master' '
+	rm -fr frotz xyzzy nitfol &&
+	git checkout -f master
+'
 
 test_expect_success 'switch from dir to symlink' '
 
-- 
1.7.1.dirty

  parent reply	other threads:[~2010-05-07 19:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-07 19:37 [PATCH 1/6] Make test-lib.sh emit valid TAP format Ævar Arnfjörð Bjarmason
2010-05-07 19:37 ` [PATCH 2/6] Move t6000lib.sh to lib-* Ævar Arnfjörð Bjarmason
2010-05-07 20:21   ` Jakub Narebski
2010-05-07 19:37 ` [PATCH 3/6] Skip tests in a way that makes sense under TAP Ævar Arnfjörð Bjarmason
2010-05-07 19:37 ` Ævar Arnfjörð Bjarmason [this message]
2010-05-07 20:23   ` [PATCH 4/6] Turn setup code in t2007-checkout-symlink.sh into a test Jakub Narebski
2010-05-07 19:37 ` [PATCH 5/6] We use TAP so the Perl test can run without scaffolding Ævar Arnfjörð Bjarmason
2010-05-07 19:37 ` [PATCH 6/6] Add test_harness make target for testing with prove(1) Ævar Arnfjörð Bjarmason
2010-05-07 20:20   ` Jakub Narebski
2010-05-08  3:58     ` Junio C Hamano
2010-05-09 11:04   ` Tor Arntsen
2010-05-07 19:50 ` [PATCH 1/6] Make test-lib.sh emit valid TAP format Sverre Rabbelier
2010-05-07 20:25   ` Ævar Arnfjörð Bjarmason
2010-05-07 20:59     ` [PATCH 1/6 v2] " Ævar Arnfjörð Bjarmason
2010-05-15 19:37       ` Ævar Arnfjörð Bjarmason
2010-05-07 20:17 ` [PATCH 1/6] " Jakub Narebski
2010-05-07 20:49   ` Æ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

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

  git send-email \
    --in-reply-to=1273261025-31523-4-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. 
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).