Re: [PATCH 3/4] t1300: fix the new --show-origin tests on Windows
Hi Junio,
On Tue, 22 Mar 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > 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).
> >
> > Signed-off-by: Johannes Schindelin
> > ---
> > t/t1300-repo-config.sh | 15 ---
> > 1 file changed, 12 insertions(+), 3 deletions(-)
> >
> > diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
> > index 0236fe2..18eb769 100755
> > --- a/t/t1300-repo-config.sh
> > +++ b/t/t1300-repo-config.sh
> > @@ -1232,6 +1232,15 @@ test_expect_success 'set up --show-origin tests' '
> > EOF
> > '
> >
> > +if test_have_prereq MINGW
> > +then
> > + # convert to Windows paths
> > + HOME="$(pwd)"
>
> We override HOME in t/test-lib.sh; shouldn't this be done there?
We override it with $PWD.
Remember, on Windows we have this funny situation where the shell,
Perl, and the Unix tools used in scripting, know about POSIX paths, but
little else. Most notably git.exe does *not* understand them [*1*].
The difference between $PWD and $(pwd) is, you guessed it, POSIX path vs
Windows path, respectively. And since *some* of our tests verify
shell/Perl scripts' correct behavior, we *want* $HOME to be a POSIX path,
at least some of the time.
> > + INCLUDE_DIR="$HOME/include"
>
> I am puzzled. 'set up --show-origin tests' do say INCLUDE_DIR is
> "$HOME/include" already, so why is this needed?
>
> > + export HOME INCLUDE_DIR
>
> Existing tests use $INCLUDE_DIR (and $HOME) as shell variables just
> fine without exporting. Why do these need to be exported only on
> MINGW?
Habit. The export is actually not needed at all, you are totally correct.
> > + git config -f .gitconfig include.path "$INCLUDE_DIR/absolute.include"
> > +fi
>
> Perhaps if you adjust HOME before 'set up --show-origin tests' test,
> most (or all) of the above become unnecessary?
It did not even occur to me, thanks for that suggestion. It works
perfectly. Will send out v2 in a moment.
Ciao,
Dscho
Footnote [*1*]: we do have this hack, system_path(), that can turn "POSIX
paths" into Windows paths. However, it actually turns paths relative to
the prefix (as in "/usr/") into Windows paths, and the prefix is
determined at runtime, from the location of git.exe. When the test suite
runs, the location of git.exe is most definitely *not* related to any
sensible prefix, therefore we simply cannot expect git.exe to handle POSIX
paths correctly in the test suite.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] t1300: fix the new --show-origin tests on Windows
Johannes Schindelin writes:
> 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).
>
> Signed-off-by: Johannes Schindelin
> ---
> t/t1300-repo-config.sh | 15 ---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
> index 0236fe2..18eb769 100755
> --- a/t/t1300-repo-config.sh
> +++ b/t/t1300-repo-config.sh
> @@ -1232,6 +1232,15 @@ test_expect_success 'set up --show-origin tests' '
> EOF
> '
>
> +if test_have_prereq MINGW
> +then
> + # convert to Windows paths
> + HOME="$(pwd)"
We override HOME in t/test-lib.sh; shouldn't this be done there?
> + INCLUDE_DIR="$HOME/include"
I am puzzled. 'set up --show-origin tests' do say INCLUDE_DIR is
"$HOME/include" already, so why is this needed?
> + export HOME INCLUDE_DIR
Existing tests use $INCLUDE_DIR (and $HOME) as shell variables just
fine without exporting. Why do these need to be exported only on
MINGW?
> + git config -f .gitconfig include.path "$INCLUDE_DIR/absolute.include"
> +fi
Perhaps if you adjust HOME before 'set up --show-origin tests' test,
most (or all) of the above become unnecessary?
The changes below that skip tests that relies on pathnames that
cannot be used on Windows makes sense, though.
> test_expect_success '--show-origin with --list' '
> cat >expect <<-EOF &&
> file:$HOME/.gitconfig user.global=true
> @@ -1304,7 +1313,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 +1342,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 +1351,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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] t1300: fix the new --show-origin tests on Windows
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).
Signed-off-by: Johannes Schindelin
---
t/t1300-repo-config.sh | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 0236fe2..18eb769 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1232,6 +1232,15 @@ test_expect_success 'set up --show-origin tests' '
EOF
'
+if test_have_prereq MINGW
+then
+ # convert to Windows paths
+ HOME="$(pwd)"
+ INCLUDE_DIR="$HOME/include"
+ export HOME INCLUDE_DIR
+ git config -f .gitconfig include.path "$INCLUDE_DIR/absolute.include"
+fi
+
test_expect_success '--show-origin with --list' '
cat >expect <<-EOF &&
file:$HOME/.gitconfig user.global=true
@@ -1304,7 +1313,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 +1342,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 +1351,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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
