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>
Pat Thoyts committed
Sep 27, 2010 at 22:02 UTC
3ba9ba8f34eda286867fba37e496850dc109af74
3 files changed
+6
-10
t/t1300-repo-config.sh
+3
-3
@@ -701,13 +701,13 @@ cat >expect <<\EOF
701
trailingtilde = foo~
702
EOF
703
704
-test_expect_success 'set --path' '
704
+test_expect_success NOT_MINGW 'set --path' '
705
git config --path path.home "~/" &&
706
git config --path path.normal "/dev/null" &&
707
git config --path path.trailingtilde "foo~" &&
708
test_cmp expect .git/config'
709
710
-if test "${HOME+set}"
710
+if test_have_prereq NOT_MINGW && test "${HOME+set}"
711
then
712
test_set_prereq HOMEVAR
713
fi
@@ -730,7 +730,7 @@ cat >expect <<\EOF
730
foo~
731
EOF
732
733
-test_expect_success 'get --path copes with unset $HOME' '
733
+test_expect_success NOT_MINGW 'get --path copes with unset $HOME' '
734
(
735
unset HOME;
736
test_must_fail git config --get --path path.home \
t/t5503-tagfollow.sh
+2
-7
@@ -4,14 +4,9 @@ test_description='test automatic tag following'
4
5
. ./test-lib.sh
6
7
-case $(uname -s) in
8
-*MINGW*)
7
+if !test_have_prereq NOT_MINGW; then
8
say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
10
- ;;
11
-*)
12
- test_set_prereq NOT_MINGW
13
- ;;
14
-esac
9
+fi
10
11
# End state of the repository:
12
#
t/test-lib.sh
+1
@@ -975,6 +975,7 @@ case $(uname -s) in
975
test_set_prereq POSIXPERM
976
test_set_prereq BSLASHPSPEC
977
test_set_prereq EXECKEEPSPID
978
+ test_set_prereq NOT_MINGW
979
;;
980
esac
981