* [PATCH] Skip t1300.70 and 71 on msysGit.
@ 2010-02-15 23:14 Pat Thoyts
2010-02-16 9:27 ` [msysGit] " Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Pat Thoyts @ 2010-02-15 23:14 UTC (permalink / raw)
To: msysgit; +Cc: git
These two tests fail on msysGit because /dev/null is an alias for nul on
Windows and when reading the value back from git config the alias does
not match the real filename. Also the HOME environment variable has a
unix-style path but git returns a native equivalent path for '~'. As
these are platform-dependent equivalent results it seems simplest to
skip the test entirely.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
t/t1300-repo-config.sh | 6 +++---
t/test-lib.sh | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index f11f98c..90541a3 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -701,7 +701,7 @@ cat >expect <<\EOF
trailingtilde = foo~
EOF
-test_expect_success 'set --path' '
+test_expect_success NONMINGW 'set --path' '
git config --path path.home "~/" &&
git config --path path.normal "/dev/null" &&
git config --path path.trailingtilde "foo~" &&
@@ -713,14 +713,14 @@ $HOME/
foo~
EOF
-test_expect_success 'get --path' '
+test_expect_success NONMINGW 'get --path' '
git config --get --path path.home > result &&
git config --get --path path.normal >> result &&
git config --get --path path.trailingtilde >> result &&
test_cmp expect result
'
-rm .git/config
+test_have_prereq NONMINGW && rm .git/config
git config quote.leading " test"
git config quote.ending "test "
diff --git a/t/test-lib.sh b/t/test-lib.sh
index afd3053..f6a1590 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -776,6 +776,7 @@ case $(uname -s) in
test_set_prereq POSIXPERM
test_set_prereq BSLASHPSPEC
test_set_prereq EXECKEEPSPID
+ test_set_prereq NONMINGW
;;
esac
--
1.7.0.rc2.1438.gebbe6.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [msysGit] [PATCH] Skip t1300.70 and 71 on msysGit.
2010-02-15 23:14 [PATCH] Skip t1300.70 and 71 on msysGit Pat Thoyts
@ 2010-02-16 9:27 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2010-02-16 9:27 UTC (permalink / raw)
To: Pat Thoyts; +Cc: msysgit, git
Hi Pat,
On Mon, 15 Feb 2010, Pat Thoyts wrote:
> These two tests fail on msysGit because /dev/null is an alias for nul on
> Windows and when reading the value back from git config the alias does
> not match the real filename. Also the HOME environment variable has a
> unix-style path but git returns a native equivalent path for '~'. As
> these are platform-dependent equivalent results it seems simplest to
> skip the test entirely.
>
> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
> ---
Can you push this to 4msysgit's 'devel' branch?
Thank you,
Dscho
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-16 9:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-15 23:14 [PATCH] Skip t1300.70 and 71 on msysGit Pat Thoyts
2010-02-16 9:27 ` [msysGit] " Johannes Schindelin
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).