tests: explicitly use test-tool.exe on Windows

dscho · gitster · commit d609615f4897 · 2019-01-22T12:35:59.000-08:00
In 8abfdf4 (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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -1007,7 +1007,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'

Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,7 @@ test -d "$GIT_BUILD_DIR"/templates/blt \|\| {`
`1007`	`1007`	`error "You haven't built things yet, have you?"`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`		`-if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool`
	`1010`	`+if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X`
`1011`	`1011`	`then`
`1012`	`1012`	`echo >&2 'You need to build test-tool:'`
`1013`	`1013`	`echo >&2 'Run "make t/helper/test-tool" in the source (toplevel) directory'`