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>

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 074f2f2e3e57f76b01f16502998e95b493676711..d0ab8ffe1b91a7fa37dfc7939cb3d5ae2c3cc100 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -701,13 +701,13 @@ cat >expect <<\EOF
        trailingtilde = foo~
 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'
 
        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
 then
        test_set_prereq HOMEVAR
 fi


@@ -730,7 +730,7 @@ cat >expect <<\EOF
 foo~
 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 \
        (
                unset HOME;
                test_must_fail git config --get --path path.home \

diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index 8a298a655fa007fbd9a43d6212b53f749c980eb6..b6b1fc30cd994129b5894c45c01f3b8b3a73eddc 100755 (executable)
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -4,14 +4,9 @@ test_description='test automatic tag following'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-case $(uname -s) in
-*MINGW*)
+if !test_have_prereq NOT_MINGW; then

        say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
        say "GIT_DEBUG_SEND_PACK not supported - skipping tests"

-       ;;
-*)
-       test_set_prereq NOT_MINGW
-       ;;
-esac
+fi

 
 # End state of the repository:
 #
 
 # End state of the repository:
 #

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 830e5e7360350a424a2fe6016a03c913209f7557..a85e7954adb857253375e8eefa31124d6b189160 100644 (file)
--- 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 POSIXPERM
        test_set_prereq BSLASHPSPEC
        test_set_prereq EXECKEEPSPID

+       test_set_prereq NOT_MINGW

        ;;
 esac
 
        ;;
 esac