diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-09-27 22:02:57 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-10-01 23:08:47 +0100 |
| commit | 3ba9ba8f34eda286867fba37e496850dc109af74 (patch) | |
| tree | 6cc68d37dbf4a6b577aaca9f61c67a4128affcfd | |
| parent | 4e57bafe8bc60e35b9841b22f99882581c466daf (diff) | |
| download | git-3ba9ba8f34eda286867fba37e496850dc109af74.tar.gz git-3ba9ba8f34eda286867fba37e496850dc109af74.tar.xz | |
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.
Moves the NOT_MINGW prereq from t5503 into the test library.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| -rwxr-xr-x | t/t1300-repo-config.sh | 6 | ||||
| -rwxr-xr-x | t/t5503-tagfollow.sh | 9 | ||||
| -rw-r--r-- | t/test-lib.sh | 1 |
3 files changed, 6 insertions, 10 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 074f2f2e3..d0ab8ffe1 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -701,13 +701,13 @@ cat >expect <<\EOF trailingtilde = foo~ EOF -test_expect_success 'set --path' ' +test_expect_success NOT_MINGW 'set --path' ' git config --path path.home "~/" && git config --path path.normal "/dev/null" && git config --path path.trailingtilde "foo~" && test_cmp expect .git/config' -if test "${HOME+set}" +if test_have_prereq NOT_MINGW && test "${HOME+set}" then test_set_prereq HOMEVAR fi @@ -730,7 +730,7 @@ cat >expect <<\EOF foo~ EOF -test_expect_success 'get --path copes with unset $HOME' ' +test_expect_success NOT_MINGW 'get --path copes with unset $HOME' ' ( unset HOME; test_must_fail git config --get --path path.home \ diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh index 8a298a655..b6b1fc30c 100755 --- a/t/t5503-tagfollow.sh +++ b/t/t5503-tagfollow.sh @@ -4,14 +4,9 @@ test_description='test automatic tag following' . ./test-lib.sh -case $(uname -s) in -*MINGW*) +if !test_have_prereq NOT_MINGW; then say "GIT_DEBUG_SEND_PACK not supported - skipping tests" - ;; -*) - test_set_prereq NOT_MINGW - ;; -esac +fi # End state of the repository: # diff --git a/t/test-lib.sh b/t/test-lib.sh index 830e5e736..a85e7954a 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -975,6 +975,7 @@ case $(uname -s) in test_set_prereq POSIXPERM test_set_prereq BSLASHPSPEC test_set_prereq EXECKEEPSPID + test_set_prereq NOT_MINGW ;; esac |