From 3ca59460c157380214aa99580ebaca41f8ab6785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= Date: Tue, 10 Mar 2015 12:50:57 +0100 Subject: [PATCH] mingw: Fix CVS-related tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CVS tests expect `pwd` to return a POSIX-style directory. Let's skip our MinGW-specific override to let `pwd` output a Windows-style directory for that reason. Helped-by: Johannes Schindelin Signed-off-by: 마누엘 --- t/t9400-git-cvsserver-server.sh | 8 ++++++++ t/t9401-git-cvsserver-crlf.sh | 8 ++++++++ t/t9402-git-cvsserver-refs.sh | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 6146c3fec2..27a9b0ec03 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -10,6 +10,14 @@ cvs CLI client via git-cvsserver server' . ./test-lib.sh +if test_have_prereq MINGW +then + # Avoid posix-to-windows path mangling + pwd () { + builtin pwd + } +fi + if ! test_have_prereq PERL; then skip_all='skipping git cvsserver tests, perl not available' test_done diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh index 5a4ed28e49..5271432b8a 100755 --- a/t/t9401-git-cvsserver-crlf.sh +++ b/t/t9401-git-cvsserver-crlf.sh @@ -11,6 +11,14 @@ repository using cvs CLI client via git-cvsserver server' . ./test-lib.sh +if test_have_prereq MINGW +then + # Avoid posix-to-windows path mangling + pwd () { + builtin pwd + } +fi + marked_as () { foundEntry="$(grep "^/$2/" "$1/CVS/Entries")" if [ x"$foundEntry" = x"" ] ; then diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh index d00df08731..936fd762e5 100755 --- a/t/t9402-git-cvsserver-refs.sh +++ b/t/t9402-git-cvsserver-refs.sh @@ -7,6 +7,14 @@ tags, branches and other git refspecs' . ./test-lib.sh +if test_have_prereq MINGW +then + # Avoid posix-to-windows path mangling + pwd () { + builtin pwd + } +fi + ######### check_start_tree() {