From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Johannes Sixt <j.sixt@viscovery.net>,
Elijah Newren <newren@gmail.com>
Subject: [PATCH 2/2] Mark tests that use symlinks as needing SYMLINKS prerequisite
Date: Thu, 12 Aug 2010 20:09:12 -0600 [thread overview]
Message-ID: <1281665352-10533-3-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1281665352-10533-1-git-send-email-newren@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t3509-cherry-pick-merge-df.sh | 6 ++++++
t/t9350-fast-export.sh | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index 6e7ef84..93ad20d 100755
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -3,6 +3,12 @@
test_description='Test cherry-pick with directory/file conflicts'
. ./test-lib.sh
+if ! test_have_prereq SYMLINKS
+then
+ skip_all="symbolic links not supported - skipping tests"
+ test_done
+fi
+
test_expect_success 'Setup rename across paths each below D/F conflicts' '
mkdir a &&
>a/f &&
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 1ee1461..27aea5c 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -376,7 +376,7 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
-test_expect_success 'directory becomes symlink' '
+test_expect_success SYMLINKS 'directory becomes symlink' '
git init dirtosymlink &&
git init result &&
(
--
1.7.2.1.119.gca9fe.dirty
prev parent reply other threads:[~2010-08-13 2:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-13 2:09 [PATCH 0/2] Fix windows portability issues in en/d-f-conflict-fix series Elijah Newren
2010-08-13 2:09 ` [PATCH 1/2] merge-recursive: Workaround unused variable warning Elijah Newren
2010-08-18 0:00 ` Elijah Newren
2010-08-18 0:10 ` Jonathan Nieder
2010-08-18 18:55 ` Junio C Hamano
2010-08-18 22:02 ` Elijah Newren
2010-08-18 22:25 ` Junio C Hamano
2010-08-18 23:13 ` Elijah Newren
2010-08-13 2:09 ` Elijah Newren [this message]
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=1281665352-10533-3-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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).