From: Alex Riesen <raa.lkml@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Johannes Sixt <j6t@kdbg.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] t3703: skip more tests using colons in file names on Windows
Date: Tue, 7 Jun 2011 15:43:55 +0200 [thread overview]
Message-ID: <BANLkTik3K2GVZ5rzegYSXRrvROU_bzBdVw@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]
Use the same test and prerequisite as introduced in similar
fix in 650af7ae8bdf92bd92df2.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Why didn't Johannes noticed it, I wonder. The failing test was
here all the time.
OTOH, I update my Windows repo very irregularly lately, may be
it is the same with Johannes. Windows is just not very friendly
development environment (more of a breaking environment).
t/t3703-add-magic-pathspec.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index e508246..5115de7 100755
--- a/t/t3703-add-magic-pathspec.sh
+++ b/t/t3703-add-magic-pathspec.sh
@@ -38,17 +38,17 @@ cat >expected <<EOF
add 'sub/foo'
EOF
-test_expect_success 'a file with the same (long) magic name exists' '
- : >":(icase)ha" &&
- test_must_fail git add -n ":(icase)ha" &&
- git add -n "./:(icase)ha"
-'
-
if mkdir ":" 2>/dev/null
then
test_set_prereq COLON_DIR
fi
+test_expect_success COLON_DIR 'a file with the same (long) magic name exists' '
+ : >":(icase)ha" &&
+ test_must_fail git add -n ":(icase)ha" &&
+ git add -n "./:(icase)ha"
+'
+
test_expect_success COLON_DIR 'a file with the same (short) magic
name exists' '
: >":/bar" &&
test_must_fail git add -n :/bar &&
--
1.7.5.1.407.g53f4f
[-- Attachment #2: 0001-t3703-skip-more-tests-using-colons-in-file-names-on-W.diff --]
[-- Type: application/octet-stream, Size: 1283 bytes --]
From bca3fa7df30b946841bd05d6ce7aac239721c097 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 7 Jun 2011 11:49:44 +0200
Subject: [PATCH] t3703: skip more tests using colons in file names on Windows
Use the same test and prerequisite as introduced in similar
fix in 650af7ae8bdf92bd92df2.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
t/t3703-add-magic-pathspec.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index e508246..5115de7 100755
--- a/t/t3703-add-magic-pathspec.sh
+++ b/t/t3703-add-magic-pathspec.sh
@@ -38,17 +38,17 @@ cat >expected <<EOF
add 'sub/foo'
EOF
-test_expect_success 'a file with the same (long) magic name exists' '
- : >":(icase)ha" &&
- test_must_fail git add -n ":(icase)ha" &&
- git add -n "./:(icase)ha"
-'
-
if mkdir ":" 2>/dev/null
then
test_set_prereq COLON_DIR
fi
+test_expect_success COLON_DIR 'a file with the same (long) magic name exists' '
+ : >":(icase)ha" &&
+ test_must_fail git add -n ":(icase)ha" &&
+ git add -n "./:(icase)ha"
+'
+
test_expect_success COLON_DIR 'a file with the same (short) magic name exists' '
: >":/bar" &&
test_must_fail git add -n :/bar &&
--
1.7.5.1.407.g53f4f
next reply other threads:[~2011-06-07 13:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-07 13:43 Alex Riesen [this message]
2011-06-08 6:22 ` [PATCH] t3703: skip more tests using colons in file names on Windows Johannes Sixt
2011-06-08 10:44 ` Alex Riesen
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=BANLkTik3K2GVZ5rzegYSXRrvROU_bzBdVw@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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).