Merge branch 'js/test-git-installed'

gitster · gitster · commit 11494daae7d6 · 2019-02-05T14:26:15.000-08:00
Test fix for Windows.

* js/test-git-installed:
  tests: explicitly use `test-tool.exe` on Windows
diff --git 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'

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