tests: explicitly use test-tool.exe on Windows

dscho · dscho · commit 3b193cd2e337 · 2019-02-07T14:46:09.000+01: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>
diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -1021,7 +1021,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
`@@ -1021,7 +1021,7 @@ test -d "$GIT_BUILD_DIR"/templates/blt \|\| {`
`1021`	`1021`	`error "You haven't built things yet, have you?"`
`1022`	`1022`	`}`
`1023`	`1023`
`1024`		`-if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool`
	`1024`	`+if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X`
`1025`	`1025`	`then`
`1026`	`1026`	`echo >&2 'You need to build test-tool:'`
`1027`	`1027`	`echo >&2 'Run "make t/helper/test-tool" in the source (toplevel) directory'`