From: Lars Schneider <larsxschneider@gmail.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Johannes Sixt" <j6t@kdbg.org>,
"Kazutoshi SATODA" <k_satoda@f2.dion.ne.jp>,
"Eric Wong" <normalperson@yhbt.net>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Torsten Bögershausen" <tboegi@web.de>
Subject: Re: [PATCH v2 3/4] t1300: fix the new --show-origin tests on Windows
Date: Wed, 23 Mar 2016 12:08:16 +0100 [thread overview]
Message-ID: <144C8B10-A98F-4888-ADB8-8C9D67BF52D9@gmail.com> (raw)
In-Reply-To: <86f6c23e500867f403c33c2716826dc0c5db0cdb.1458730457.git.johannes.schindelin@gmx.de>
On 23 Mar 2016, at 11:55, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
> On Windows, we have that funny situation where the test script can refer
> to POSIX paths because it runs in a shell that uses a POSIX emulation
> layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths
> at all but only pure Windows paths.
>
> So let's just convert the POSIX paths to Windows paths before passing
> them on to Git, using `pwd` (which is already modified on Windows to
> output Windows paths).
>
> While fixing the new tests on Windows, we also have to exclude the tests
> that want to write a file with a name that is illegal on Windows
> (unfortunately, there is more than one test trying to make use of that
> file).
Thanks for these Windows fixes! After the 2.8 release I will try to post
a patch that uses a different filename where possible.
Cheers,
Lars
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> t/t1300-repo-config.sh | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
> index dca27a3..a37ebb2 100755
> --- a/t/t1300-repo-config.sh
> +++ b/t/t1300-repo-config.sh
> @@ -1205,6 +1205,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing permissions' '
> "die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600"
> '
>
> +! test_have_prereq MINGW ||
> +HOME="$(pwd)" # convert to Windows path
> +
> test_expect_success 'set up --show-origin tests' '
> INCLUDE_DIR="$HOME/include" &&
> mkdir -p "$INCLUDE_DIR" &&
> @@ -1232,6 +1235,7 @@ test_expect_success 'set up --show-origin tests' '
> EOF
> '
>
> +
> test_expect_success '--show-origin with --list' '
> cat >expect <<-EOF &&
> file:$HOME/.gitconfig user.global=true
> @@ -1304,7 +1308,7 @@ test_expect_success 'set up custom config file' '
> EOF
> '
>
> -test_expect_success '--show-origin escape special file name characters' '
> +test_expect_success !MINGW '--show-origin escape special file name characters' '
> cat >expect <<-\EOF &&
> file:"file\" (dq) and spaces.conf" user.custom=true
> EOF
> @@ -1333,7 +1337,7 @@ test_expect_success '--show-origin stdin with file include' '
> test_cmp expect output
> '
>
> -test_expect_success '--show-origin blob' '
> +test_expect_success !MINGW '--show-origin blob' '
> cat >expect <<-\EOF &&
> blob:a9d9f9e555b5c6f07cbe09d3f06fe3df11e09c08 user.custom=true
> EOF
> @@ -1342,7 +1346,7 @@ test_expect_success '--show-origin blob' '
> test_cmp expect output
> '
>
> -test_expect_success '--show-origin blob ref' '
> +test_expect_success !MINGW '--show-origin blob ref' '
> cat >expect <<-\EOF &&
> blob:"master:file\" (dq) and spaces.conf" user.custom=true
> EOF
> --
> 2.7.4.windows.1
>
>
next prev parent reply other threads:[~2016-03-23 11:08 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 17:42 [PATCH 0/4] Git for Windows fixes in preparation for 2.8.0 Johannes Schindelin
2016-03-22 17:42 ` [PATCH 1/4] config --show-origin: report paths with forward slashes Johannes Schindelin
2016-03-22 17:58 ` Junio C Hamano
2016-03-23 8:20 ` Johannes Schindelin
2016-03-23 16:34 ` Junio C Hamano
2016-03-28 7:58 ` Johannes Sixt
2016-03-28 15:14 ` Johannes Schindelin
2016-03-29 19:18 ` Johannes Sixt
2016-03-29 20:05 ` Junio C Hamano
2016-04-02 19:03 ` Johannes Sixt
2016-04-04 15:51 ` Junio C Hamano
2016-04-04 20:42 ` Johannes Schindelin
2016-03-30 5:52 ` Johannes Sixt
2016-04-02 18:51 ` Johannes Sixt
2016-03-22 17:42 ` [PATCH 2/4] Make t1300-repo-config resilient to being run via 'sh -x' Johannes Schindelin
2016-03-22 17:59 ` Jonathan Nieder
2016-03-22 20:34 ` Junio C Hamano
2016-03-22 23:45 ` Jonathan Nieder
2016-03-23 7:21 ` Johannes Schindelin
2016-03-22 18:01 ` Junio C Hamano
2016-03-23 8:22 ` Johannes Schindelin
2016-03-22 17:42 ` [PATCH 3/4] t1300: fix the new --show-origin tests on Windows Johannes Schindelin
2016-03-22 18:13 ` Junio C Hamano
2016-03-23 10:42 ` Johannes Schindelin
2016-03-22 17:43 ` [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues Johannes Schindelin
2016-03-22 18:03 ` Jonathan Nieder
2016-03-22 18:30 ` Torsten Bögershausen
2016-03-22 20:44 ` Junio C Hamano
2016-03-22 22:44 ` Torsten Bögershausen
2016-03-22 22:57 ` Junio C Hamano
2016-03-23 5:54 ` Torsten Bögershausen
2016-03-23 10:49 ` Johannes Schindelin
2016-03-23 15:56 ` Junio C Hamano
2016-03-23 19:08 ` Torsten Bögershausen
2016-03-23 22:44 ` Torsten Bögershausen
2016-03-22 17:50 ` [PATCH 0/4] Git for Windows fixes in preparation for 2.8.0 Junio C Hamano
2016-03-23 10:54 ` [PATCH v2 " Johannes Schindelin
2016-03-23 10:55 ` [PATCH v2 1/4] config --show-origin: report paths with forward slashes Johannes Schindelin
2016-03-23 10:55 ` [PATCH v2 2/4] Make t1300-repo-config resilient to being run via 'sh -x' Johannes Schindelin
2016-03-23 10:55 ` [PATCH v2 3/4] t1300: fix the new --show-origin tests on Windows Johannes Schindelin
2016-03-23 11:08 ` Lars Schneider [this message]
2016-03-23 10:55 ` [PATCH v2 4/4] mingw: skip some tests in t9115 due to file name issues Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=144C8B10-A98F-4888-ADB8-8C9D67BF52D9@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=jrnieder@gmail.com \
--cc=k_satoda@f2.dion.ne.jp \
--cc=normalperson@yhbt.net \
--cc=tboegi@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).