From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Feb 2019 22:26:15 +0000 (-0800)
Subject: Merge branch 'js/test-git-installed'
X-Git-Tag: v2.21.0-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/11494daae7d6101cfb565b2a86b4dacefaeeedd8?hp=ff09c9e5bad8971d25e7e2039836c9d42797e30a

Merge branch 'js/test-git-installed'

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
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'