git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH v3 00/20] Let Git's tests pass on Windows
Date: Wed, 27 Jan 2016 17:19:02 +0100 (CET)	[thread overview]
Message-ID: <cover.1453911367.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1453818789.git.johannes.schindelin@gmx.de>

[-- Attachment #1: Type: text/plain, Size: 9076 bytes --]

This is a big milestone. With these modifications, Git's source code
does not only build without warnings in Git for Windows' SDK, but
passes the entire regression test suite.

The patch series contains three different types of patches. First,
there are a couple of real fixes that were triggered by failures in
the regression tests. Then there are a couple of fixes to the
regression tests themselves. And finally, we have to disable a couple
of tests because we simply cannot make them work on Windows.

Relative to v2, this fixes stupid typos that made the tests fail on
Linux, a stupid copy-paste error pointed out by Eric Sunshine,
unnecessary 'printf ""' calls pointed out by Junio Hamano, and I now
use `test_have_prereq !MINGW` consistently, as pointed out by both Eric
and Junio. This time, I also send the patch series with the character
set set (sic!) to UTF-8. Oh, and this time, I also made sure that the
regression tests pass on Windows & Linux alike. Oh, and I also managed not
to forget the fix for t9130 this time.


Johannes Schindelin (17):
  mingw: let's use gettext with MSYS2
  mingw: do not trust MSYS2's MinGW gettext.sh
  Git.pm: stop assuming that absolute paths start with a slash
  mingw: prepare the TMPDIR environment variable for shell scripts
  mingw: let lstat() fail with errno == ENOTDIR when appropriate
  mingw: fix t5601-clone.sh
  mingw: accomodate t0060-path-utils for MSYS2
  mingw: disable mkfifo-based tests
  tests: turn off git-daemon tests if FIFOs are not available
  mingw: skip test in t1508 that fails due to path conversion
  mingw: fix t9700's assumption about directory separators
  mingw: work around pwd issues in the tests
  mingw: mark t9100's test cases with appropriate prereqs
  mingw: avoid illegal filename in t9118
  mingw: handle the missing POSIXPERM prereq in t9124
  mingw: skip a test in t9130 that cannot pass on Windows
  mingw: do not bother to test funny file names

Karsten Blees (1):
  mingw: factor out Windows specific environment setup

Pat Thoyts (1):
  Avoid absolute path in t0008

마누엘 (1):
  mingw: try to delete target directory before renaming

 Makefile                              |  1 +
 compat/mingw.c                        | 91 +++++++++++++++++++++++++++++------
 config.mak.uname                      |  3 +-
 perl/Git.pm                           |  3 +-
 t/lib-git-daemon.sh                   |  5 ++
 t/t0008-ignores.sh                    |  2 +-
 t/t0060-path-utils.sh                 |  9 ++++
 t/t1508-at-combinations.sh            |  6 ++-
 t/t3300-funny-names.sh                |  1 +
 t/t3600-rm.sh                         |  2 +-
 t/t3703-add-magic-pathspec.sh         |  2 +-
 t/t3902-quoted.sh                     |  1 +
 t/t4016-diff-quote.sh                 |  1 +
 t/t4135-apply-weird-filenames.sh      |  3 +-
 t/t5601-clone.sh                      | 18 +++----
 t/t7800-difftool.sh                   | 14 +++---
 t/t9100-git-svn-basic.sh              | 18 +++----
 t/t9118-git-svn-funky-branch-names.sh | 12 +++--
 t/t9124-git-svn-dcommit-auto-props.sh | 16 +++---
 t/t9130-git-svn-authors-file.sh       |  2 +-
 t/t9200-git-cvsexportcommit.sh        |  2 +-
 t/t9400-git-cvsserver-server.sh       |  6 +--
 t/t9401-git-cvsserver-crlf.sh         |  6 +--
 t/t9402-git-cvsserver-refs.sh         |  6 +--
 t/t9700/test.pl                       |  2 +-
 t/t9903-bash-prompt.sh                |  2 +-
 t/test-lib.sh                         |  2 +-
 test-fake-ssh.c                       | 30 ++++++++++++
 28 files changed, 196 insertions(+), 70 deletions(-)
 create mode 100644 test-fake-ssh.c

Interdiff vs v2:

 diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
 index c59d554..4a9964e 100755
 --- a/t/t1508-at-combinations.sh
 +++ b/t/t1508-at-combinations.sh
 @@ -35,9 +35,9 @@ test_expect_success 'setup' '
  	git checkout -b upstream-branch &&
  	test_commit upstream-one &&
  	test_commit upstream-two &&
 -	if ! test_have_prereq MINGW
 +	if test_have_prereq !MINGW
  	then
 -		git checkout -b @/at-slash
 +		git checkout -b @/at-test
  	fi &&
  	git checkout -b @@/at-test &&
  	git checkout -b @at-test &&
 diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
 index 5232ee9..d046d98 100755
 --- a/t/t3600-rm.sh
 +++ b/t/t3600-rm.sh
 @@ -14,8 +14,7 @@ test_expect_success \
       git add -- foo bar baz 'space embedded' -q &&
       git commit -m 'add normal files'"
  
 -
 -if ! test_have_prereq MINGW && touch -- 'tab	embedded' 'newline
 +if test_have_prereq !MINGW && touch -- 'tab	embedded' 'newline
  embedded' 2>/dev/null
  then
  	test_set_prereq FUNNYNAMES
 diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
 index aaff784..3ef525a 100755
 --- a/t/t3703-add-magic-pathspec.sh
 +++ b/t/t3703-add-magic-pathspec.sh
 @@ -38,7 +38,7 @@ cat >expected <<EOF
  add 'sub/foo'
  EOF
  
 -if ! test_have_prereq MINGW && mkdir ":" 2>/dev/null
 +if test_have_prereq !MINGW && mkdir ":" 2>/dev/null
  then
  	test_set_prereq COLON_DIR
  fi
 diff --git a/t/t4135-apply-weird-filenames.sh b/t/t4135-apply-weird-filenames.sh
 index 6d6b96d..27cb000 100755
 --- a/t/t4135-apply-weird-filenames.sh
 +++ b/t/t4135-apply-weird-filenames.sh
 @@ -19,7 +19,7 @@ test_expect_success 'setup' '
  
  	test_when_finished "rm -f \"tab	embedded.txt\"" &&
  	test_when_finished "rm -f '\''\"quoteembedded\".txt'\''" &&
 -	if ! test_have_prereq MINGW &&
 +	if test_have_prereq !MINGW &&
  		touch -- "tab	embedded.txt" '\''"quoteembedded".txt'\''
  	then
  		test_set_prereq FUNNYNAMES
 diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
 index 2f4272a..c1efb8e 100755
 --- a/t/t5601-clone.sh
 +++ b/t/t5601-clone.sh
 @@ -5,7 +5,7 @@ test_description=clone
  . ./test-lib.sh
  
  X=
 -! test_have_prereq MINGW || X=.exe
 +test_have_prereq !MINGW || X=.exe
  
  test_expect_success setup '
  
 diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
 index 5b32a3b..56acc1e 100755
 --- a/t/t9100-git-svn-basic.sh
 +++ b/t/t9100-git-svn-basic.sh
 @@ -30,7 +30,7 @@ test_expect_success \
  		echo "deep dir" >dir/a/b/c/d/e/file &&
  		mkdir bar &&
  		echo "zzz" >bar/zzz &&
 -		printf "" | write_script exec.sh &&
 +		write_script exec.sh </dev/null &&
  		svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
  	) &&
  	rm -rf import &&
 diff --git a/t/t9124-git-svn-dcommit-auto-props.sh b/t/t9124-git-svn-dcommit-auto-props.sh
 index 2be0805..9f7231d 100755
 --- a/t/t9124-git-svn-dcommit-auto-props.sh
 +++ b/t/t9124-git-svn-dcommit-auto-props.sh
 @@ -34,7 +34,7 @@ test_expect_success 'enable auto-props config' '
  '
  
  test_expect_success 'add files matching auto-props' '
 -	printf "" | write_script exec1.sh &&
 +	write_script exec1.sh </dev/null &&
  	echo "hello" >hello.txt &&
  	echo bar >bar &&
  	git add exec1.sh hello.txt bar &&
 @@ -47,7 +47,7 @@ test_expect_success 'disable auto-props config' '
  '
  
  test_expect_success 'add files matching disabled auto-props' '
 -	printf "" | write_script exec2.sh &&
 +	write_script exec2.sh </dev/null &&
  	echo "world" >world.txt &&
  	echo zot >zot &&
  	git add exec2.sh world.txt zot &&
 @@ -65,7 +65,7 @@ test_expect_success 'check resulting svn repository' '
  	# Check properties from first commit.
  	if test_have_prereq POSIXPERM
  	then
 -		test -z "$(svn_cmd propget svn:executable exec1.sh)"
 +		test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*"
  	fi &&
  	test "x$(svn_cmd propget svn:mime-type exec1.sh)" = \
  	     "xapplication/x-shellscript" &&
 @@ -76,7 +76,7 @@ test_expect_success 'check resulting svn repository' '
  	# Check properties from second commit.
  	if test_have_prereq POSIXPERM
  	then
 -		test -z "$(svn_cmd propget svn:executable exec2.sh)"
 +		test "x$(svn_cmd propget svn:executable exec2.sh)" = "x*"
  	fi &&
  	test "x$(svn_cmd propget svn:mime-type exec2.sh)" = "x" &&
  	test "x$(svn_cmd propget svn:mime-type world.txt)" = "x" &&
 diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
 index d306b77..4126481 100755
 --- a/t/t9130-git-svn-authors-file.sh
 +++ b/t/t9130-git-svn-authors-file.sh
 @@ -91,7 +91,7 @@ test_expect_success 'fetch continues after authors-file is fixed' '
  	)
  	'
  
 -test_expect_success 'fresh clone with svn.authors-file in config' '
 +test_expect_success !MINGW 'fresh clone with svn.authors-file in config' '
  	(
  		rm -r "$GIT_DIR" &&
  		test x = x"$(git config svn.authorsfile)" &&
 diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
 index 2ee6564..ffbfa0e 100755
 --- a/t/t9903-bash-prompt.sh
 +++ b/t/t9903-bash-prompt.sh
 @@ -67,7 +67,7 @@ repo_with_newline='repo
  with
  newline'
  
 -if ! test_have_prereq MINGW && mkdir "$repo_with_newline" 2>/dev/null
 +if test_have_prereq !MINGW && mkdir "$repo_with_newline" 2>/dev/null
  then
  	test_set_prereq FUNNYNAMES
  else

-- 
2.7.0.windows.1.7.g55a05c8

  parent reply	other threads:[~2016-01-27 16:19 UTC|newest]

Thread overview: 113+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-24 15:43 [PATCH 00/19] Let Git's tests pass on Windows Johannes Schindelin
2016-01-24 15:43 ` [PATCH 01/19] mingw: let's use gettext with MSYS2 Johannes Schindelin
2016-01-25  1:42   ` Junio C Hamano
2016-01-25 16:16     ` Johannes Schindelin
2016-01-25 18:53       ` Junio C Hamano
2016-01-24 15:43 ` [PATCH 02/19] mingw: do not trust MSYS2's MinGW gettext.sh Johannes Schindelin
2016-01-24 15:43 ` [PATCH 03/19] Git.pm: stop assuming that absolute paths start with a slash Johannes Schindelin
2016-01-24 15:43 ` [PATCH 04/19] mingw: factor out Windows specific environment setup Johannes Schindelin
2016-01-24 15:43 ` [PATCH 05/19] mingw: prepare the TMPDIR environment variable for shell scripts Johannes Schindelin
2016-01-25  2:11   ` Eric Sunshine
2016-01-26  8:38     ` Johannes Schindelin
2016-01-24 15:44 ` [PATCH 06/19] mingw: try to delete target directory before renaming Johannes Schindelin
2016-01-24 17:42   ` Philip Oakley
2016-01-25  6:59     ` Johannes Schindelin
2016-01-25 18:55       ` Junio C Hamano
2016-01-26  8:14         ` Johannes Schindelin
2016-01-24 15:44 ` [PATCH 07/19] mingw: let lstat() fail with errno == ENOTDIR when appropriate Johannes Schindelin
2016-01-24 15:44 ` [PATCH 08/19] mingw: fix t5601-clone.sh Johannes Schindelin
2016-01-24 15:44 ` [PATCH 09/19] mingw: accomodate t0060-path-utils for MSYS2 Johannes Schindelin
2016-01-24 19:51   ` Johannes Sixt
2016-01-25 15:39     ` Johannes Schindelin
2016-01-24 15:44 ` [PATCH 10/19] mingw: disable mkfifo-based tests Johannes Schindelin
2016-01-24 15:44 ` [PATCH 11/19] tests: turn off git-daemon tests if FIFOs are not available Johannes Schindelin
2016-01-24 15:45 ` [PATCH 12/19] mingw: do not use symlinks with SVN in t9100 Johannes Schindelin
2016-01-25  1:51   ` Junio C Hamano
2016-01-25 16:53     ` Johannes Schindelin
2016-01-24 15:45 ` [PATCH 13/19] mingw: outsmart MSYS2's path substitution in t1508 Johannes Schindelin
2016-01-25  2:03   ` Junio C Hamano
2016-01-25  6:22     ` Eric Sunshine
2016-01-25 18:50       ` Junio C Hamano
2016-01-26  6:53         ` Johannes Schindelin
2016-01-25 16:30     ` Johannes Schindelin
2016-01-25 17:04       ` Johannes Schindelin
2016-01-24 15:45 ` [PATCH 14/19] mingw: fix t9700's assumption about directory separators Johannes Schindelin
2016-01-24 15:45 ` [PATCH 15/19] mingw: work around pwd issues in the tests Johannes Schindelin
2016-01-24 15:45 ` [PATCH 16/19] mingw: avoid absolute path in t0008 Johannes Schindelin
2016-01-25  2:11   ` Junio C Hamano
2016-01-25 16:48     ` Johannes Schindelin
2016-01-25 19:31       ` Ray Donnelly
2016-01-25 22:20       ` Junio C Hamano
2016-01-26  8:00         ` Johannes Schindelin
2016-01-24 15:45 ` [PATCH 17/19] mingw: fix git-svn tests that expect chmod to work Johannes Schindelin
2016-01-25  2:14   ` Junio C Hamano
2016-01-26  6:31     ` Johannes Schindelin
2016-01-26 17:42       ` Junio C Hamano
2016-01-24 15:45 ` [PATCH 18/19] mingw: skip a couple of git-svn tests that cannot pass on Windows Johannes Schindelin
2016-01-25  2:16   ` Junio C Hamano
2016-01-26  6:45     ` Johannes Schindelin
2016-01-24 15:45 ` [PATCH 19/19] mingw: do not bother to test funny file names Johannes Schindelin
2016-01-25  1:34 ` [PATCH 00/19] Let Git's tests pass on Windows Junio C Hamano
2016-01-25 15:45   ` Johannes Schindelin
2016-01-26 14:34 ` [PATCH v2 " Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 01/19] mingw: let's use gettext with MSYS2 Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 02/19] mingw: do not trust MSYS2's MinGW gettext.sh Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 03/19] Git.pm: stop assuming that absolute paths start with a slash Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 04/19] mingw: factor out Windows specific environment setup Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 05/19] mingw: prepare the TMPDIR environment variable for shell scripts Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 06/19] mingw: try to delete target directory before renaming Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 07/19] mingw: let lstat() fail with errno == ENOTDIR when appropriate Johannes Schindelin
2016-01-26 14:34   ` [PATCH v2 08/19] mingw: fix t5601-clone.sh Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 09/19] mingw: accomodate t0060-path-utils for MSYS2 Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 10/19] mingw: disable mkfifo-based tests Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 11/19] tests: turn off git-daemon tests if FIFOs are not available Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 12/19] mingw: skip test in t1508 that fails due to path conversion Johannes Schindelin
2016-01-26 22:02     ` Junio C Hamano
2016-01-27  8:50       ` Johannes Schindelin
2016-01-27 20:23         ` Junio C Hamano
2016-01-28  7:58           ` Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 13/19] mingw: fix t9700's assumption about directory separators Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 14/19] mingw: work around pwd issues in the tests Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 15/19] Avoid absolute path in t0008 Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 16/19] mingw: mark t9100's test cases with appropriate prereqs Johannes Schindelin
2016-01-26 21:50     ` Junio C Hamano
2016-01-27 16:02       ` Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 17/19] mingw: avoid illegal filename in t9118 Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 18/19] mingw: handle the missing POSIXPERM prereq in t9124 Johannes Schindelin
2016-01-26 22:05     ` Junio C Hamano
2016-01-27  9:20       ` Johannes Schindelin
2016-01-26 14:35   ` [PATCH v2 19/19] mingw: do not bother to test funny file names Johannes Schindelin
2016-01-26 20:03     ` Eric Sunshine
2016-01-26 20:24       ` Junio C Hamano
2016-01-27  8:33       ` Johannes Schindelin
2016-01-26 22:12   ` [PATCH v2 00/19] Let Git's tests pass on Windows Junio C Hamano
2016-01-27  8:38     ` Johannes Schindelin
2016-01-27 20:24       ` Junio C Hamano
2016-01-27 16:19   ` Johannes Schindelin [this message]
2016-01-27 16:19     ` [PATCH v3 01/20] mingw: let's use gettext with MSYS2 Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 02/20] mingw: do not trust MSYS2's MinGW gettext.sh Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 03/20] Git.pm: stop assuming that absolute paths start with a slash Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 04/20] mingw: factor out Windows specific environment setup Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 05/20] mingw: prepare the TMPDIR environment variable for shell scripts Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 06/20] mingw: try to delete target directory before renaming Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 07/20] mingw: let lstat() fail with errno == ENOTDIR when appropriate Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 08/20] mingw: fix t5601-clone.sh Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 09/20] mingw: accomodate t0060-path-utils for MSYS2 Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 10/20] mingw: disable mkfifo-based tests Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 11/20] tests: turn off git-daemon tests if FIFOs are not available Johannes Schindelin
2016-01-28  8:21       ` Eric Sunshine
2016-01-28  8:40         ` Johannes Schindelin
2016-01-28 21:35           ` Junio C Hamano
2016-01-27 16:19     ` [PATCH v3 12/20] mingw: skip test in t1508 that fails due to path conversion Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 13/20] mingw: fix t9700's assumption about directory separators Johannes Schindelin
2016-01-27 16:19     ` [PATCH v3 14/20] mingw: work around pwd issues in the tests Johannes Schindelin
2016-01-27 16:20     ` [PATCH v3 15/20] Avoid absolute path in t0008 Johannes Schindelin
2016-01-27 16:20     ` [PATCH v3 16/20] mingw: mark t9100's test cases with appropriate prereqs Johannes Schindelin
2016-01-27 16:33       ` Johannes Schindelin
2016-01-27 16:20     ` [PATCH v3 17/20] mingw: avoid illegal filename in t9118 Johannes Schindelin
2016-01-27 16:20     ` [PATCH v3 18/20] mingw: handle the missing POSIXPERM prereq in t9124 Johannes Schindelin
2016-01-27 16:20     ` [PATCH v3 19/20] mingw: skip a test in t9130 that cannot pass on Windows Johannes Schindelin
2016-01-27 16:20     ` [PATCH v3 20/20] mingw: do not bother to test funny file names Johannes Schindelin
2016-01-28  8:42     ` [PATCH v3 00/20] Let Git's tests pass on Windows Eric Sunshine
2016-01-28  8:57       ` Johannes Schindelin
2016-01-28 21:37         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover.1453911367.git.johannes.schindelin@gmx.de \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).