From 34fd2ba2caf86afaaa42b4822f5d90e7170f90a6 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Mon, 15 Feb 2010 23:14:28 +0000 Subject: [PATCH] Skip t1300.70 and 71 on msysGit. 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 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 64f05080b6..ae6bf7c219 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 ac496aa479..11a8aa96ca 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -885,6 +885,7 @@ case $(uname -s) in test_set_prereq POSIXPERM test_set_prereq BSLASHPSPEC test_set_prereq EXECKEEPSPID + test_set_prereq NONMINGW ;; esac -- 2.11.4.GIT