* [PATCH 0/1] One more fix related to TEST_GIT_INSTALLED
@ 2019-01-21 15:12 Johannes Schindelin via GitGitGadget
2019-01-21 15:12 ` [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows Johannes Schindelin via GitGitGadget
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-01-21 15:12 UTC (permalink / raw)
To: git; +Cc: Ben Peart, Junio C Hamano
This fix should have gone into https://github.com/gitgitgadget/git/pull/73
(which was submitted as
https://public-inbox.org/git/pull.73.v2.git.gitgitgadget@gmail.com and was
integrated into master via 2488849c7e76 (Merge branch
'js/test-git-installed', 2018-11-19)). Ben Peart pointed out that I had
forgotten to include it.
Johannes Schindelin (1):
tests: explicitly use `test-tool.exe` on Windows
t/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
base-commit: 16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-111%2Fdscho%2Ftest-git-installed-extra-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-111/dscho/test-git-installed-extra-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/111
--
gitgitgadget
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows
2019-01-21 15:12 [PATCH 0/1] One more fix related to TEST_GIT_INSTALLED Johannes Schindelin via GitGitGadget
@ 2019-01-21 15:12 ` Johannes Schindelin via GitGitGadget
2019-01-22 21:00 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-01-21 15:12 UTC (permalink / raw)
To: git; +Cc: Ben Peart, Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
In 8abfdf44c882 (tests: explicitly use `git.exe` on Windows,
2018-11-14), we made sure to use the `.exe` file extension when
using an absolute path to `git.exe`, to avoid getting confused with a
file or directory in the same place that lacks said file extension.
For the same reason, we need to handle test-tool.exe the same way.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index a1abb1177a..9876b4bab0 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1154,7 +1154,7 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
error "You haven't built things yet, have you?"
}
-if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool
+if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X
then
echo >&2 'You need to build test-tool:'
echo >&2 'Run "make t/helper/test-tool" in the source (toplevel) directory'
--
gitgitgadget
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows
2019-01-21 15:12 ` [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows Johannes Schindelin via GitGitGadget
@ 2019-01-22 21:00 ` Junio C Hamano
2019-01-23 11:41 ` Johannes Schindelin
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2019-01-22 21:00 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git, Ben Peart, Johannes Schindelin
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> In 8abfdf44c882 (tests: explicitly use `git.exe` on Windows,
> 2018-11-14), we made sure to use the `.exe` file extension when
> using an absolute path to `git.exe`, to avoid getting confused with a
> file or directory in the same place that lacks said file extension.
>
> For the same reason, we need to handle test-tool.exe the same way.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> t/test-lib.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index a1abb1177a..9876b4bab0 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -1154,7 +1154,7 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
> error "You haven't built things yet, have you?"
> }
>
> -if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool
> +if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X
> then
> echo >&2 'You need to build test-tool:'
> echo >&2 'Run "make t/helper/test-tool" in the source (toplevel) directory'
Thanks for being thorough. Will queue.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows
2019-01-22 21:00 ` Junio C Hamano
@ 2019-01-23 11:41 ` Johannes Schindelin
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Schindelin @ 2019-01-23 11:41 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johannes Schindelin via GitGitGadget, git, Ben Peart
Hi Junio,
On Tue, 22 Jan 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > In 8abfdf44c882 (tests: explicitly use `git.exe` on Windows,
> > 2018-11-14), we made sure to use the `.exe` file extension when
> > using an absolute path to `git.exe`, to avoid getting confused with a
> > file or directory in the same place that lacks said file extension.
> >
> > For the same reason, we need to handle test-tool.exe the same way.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> > t/test-lib.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > index a1abb1177a..9876b4bab0 100644
> > --- a/t/test-lib.sh
> > +++ b/t/test-lib.sh
> > @@ -1154,7 +1154,7 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
> > error "You haven't built things yet, have you?"
> > }
> >
> > -if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool
> > +if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X
> > then
> > echo >&2 'You need to build test-tool:'
> > echo >&2 'Run "make t/helper/test-tool" in the source (toplevel) directory'
>
> Thanks for being thorough. Will queue.
Thank you for the praise. In this instance, I do not deserve it, though,
as it was the MSVC patch series (which I hope to send the mailing list's
way soon) that identified this problem. And it was Ben's bug report
(privately, as we're team mates) that pointed out that I forgot this in
the original patch series.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-23 11:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-21 15:12 [PATCH 0/1] One more fix related to TEST_GIT_INSTALLED Johannes Schindelin via GitGitGadget
2019-01-21 15:12 ` [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows Johannes Schindelin via GitGitGadget
2019-01-22 21:00 ` Junio C Hamano
2019-01-23 11:41 ` Johannes Schindelin
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).