One more fix related to TEST_GIT_INSTALLED
cover One more fix related to TEST_GIT_INSTALLED
This fix should have gone into https://github.com/gitgitgadget/git/pull/73
(which was submitted as
https://public-inbox.org/git/[email protected] 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
Signature · 1 line
gitgitgadget
PATCH 1/1 tests: explicitly use `test-tool.exe` on Windows
From: Johannes Schindelin <[email protected]>
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.
--- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
t/test-lib.sh +1 -1
@@ -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'
Signature · 1 line
gitgitgadget
Re: [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 19 lines · writes:
From: Johannes Schindelin <[email protected]>
In
8abfdf44c882(tests: explicitly usegit.exeon Windows, 2018-11-14), we made sure to use the.exefile extension when using an absolute path togit.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 <[email protected]>--- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)t/test-lib.sh +0
-0
t/test-lib.sh test -d "$GIT_BUILD_DIR"/templates/blt || { · line 1160
Quoted 8 lines
t/test-lib.sh +1
-1@@ -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.
Re: [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows
Hi Junio,
Quoted 25 lines · Junio C Hamano
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 22 lines · writes:
From: Johannes Schindelin <[email protected]>
In
8abfdf44c882(tests: explicitly usegit.exeon Windows, 2018-11-14), we made sure to use the.exefile extension when using an absolute path togit.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 <[email protected]>--- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)t/test-lib.sh +0
-0@@ -1154,7 +1154,7 @@ test -d "$GIT_BUILD_DIR"/templates/blt || { error "You haven't built things yet, have you?" }
Quoted 7 lines
t/test-lib.sh test -d "$GIT_BUILD_DIR"/templates/blt || { · line 1160
Quoted 5 lines
t/test-lib.sh +1
-1-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