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/7] t/t5503-tagfollow: change from skip_all=* to prereq skip
Date: Tue, 10 Aug 2010 19:52:45 +0000 [thread overview]
Message-ID: <1281469968-25670-5-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1281469968-25670-1-git-send-email-avarab@gmail.com>
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/t5503-tagfollow.sh | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index bab1a53..8a298a6 100755
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -6,8 +6,11 @@ test_description='test automatic tag following'
case $(uname -s) in
*MINGW*)
- skip_all="GIT_DEBUG_SEND_PACK not supported - skipping tests"
- test_done
+ say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
+ ;;
+*)
+ test_set_prereq NOT_MINGW
+ ;;
esac
# End state of the repository:
@@ -19,7 +22,7 @@ esac
# \ C - origin/cat \
# origin/master master
-test_expect_success setup '
+test_expect_success NOT_MINGW setup '
test_tick &&
echo ichi >file &&
git add file &&
@@ -42,12 +45,15 @@ test_expect_success setup '
U=UPLOAD_LOG
+test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect
#S
want $A
#E
EOF
-test_expect_success 'fetch A (new commit : 1 connection)' '
+'
+
+test_expect_success NOT_MINGW 'fetch A (new commit : 1 connection)' '
rm -f $U
(
cd cloned &&
@@ -59,7 +65,7 @@ test_expect_success 'fetch A (new commit : 1 connection)' '
test_cmp expect actual
'
-test_expect_success "create tag T on A, create C on branch cat" '
+test_expect_success NOT_MINGW "create tag T on A, create C on branch cat" '
git tag -a -m tag1 tag1 $A &&
T=$(git rev-parse --verify tag1) &&
@@ -71,13 +77,16 @@ test_expect_success "create tag T on A, create C on branch cat" '
git checkout master
'
+test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect
#S
want $C
want $T
#E
EOF
-test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '
+'
+
+test_expect_success NOT_MINGW 'fetch C, T (new branch, tag : 1 connection)' '
rm -f $U
(
cd cloned &&
@@ -91,7 +100,7 @@ test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '
test_cmp expect actual
'
-test_expect_success "create commits O, B, tag S on B" '
+test_expect_success NOT_MINGW "create commits O, B, tag S on B" '
test_tick &&
echo O >file &&
git add file &&
@@ -107,13 +116,16 @@ test_expect_success "create commits O, B, tag S on B" '
S=$(git rev-parse --verify tag2)
'
+test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect
#S
want $B
want $S
#E
EOF
-test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
+'
+
+test_expect_success NOT_MINGW 'fetch B, S (commit and tag : 1 connection)' '
rm -f $U
(
cd cloned &&
@@ -127,13 +139,16 @@ test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
test_cmp expect actual
'
+test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect
#S
want $B
want $S
#E
EOF
-test_expect_success 'new clone fetch master and tags' '
+'
+
+test_expect_success NOT_MINGW 'new clone fetch master and tags' '
git branch -D cat
rm -f $U
(
--
1.7.2.1.295.gd03d
next prev parent reply other threads:[~2010-08-10 19:53 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 ` Ævar Arnfjörð Bjarmason [this message]
2010-08-11 18:32 ` [PATCH 4/7] t/t5503-tagfollow: " 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 ` [PATCH v2 5/7] t/t4016-diff-quote: " Ævar Arnfjörð Bjarmason
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=1281469968-25670-5-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).