aboutsummaryrefslogtreecommitdiffstats
path: root/testrunner.py
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2017-06-20 10:46:53 +0300
committerSimo Fält <simo.falt@qt.io>2017-06-21 12:38:03 +0000
commita2ad108d53330f6ea19fa69715a1d76cda21b254 (patch)
treeaed512dcf6d039143e8af3a79243019e5472cb65 /testrunner.py
parent6d8dee0c92dc914a501e2e0fe3a5e044f5d6d872 (diff)
Fix testrunner.py in win
The official git setup recommends to add only git.cmd to win PATH if ran in native CMD. Change-Id: I370752bf0d052f8047e929639b3246b726131b5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'testrunner.py')
-rw-r--r--testrunner.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/testrunner.py b/testrunner.py
index 96d9139a..2f64d86a 100644
--- a/testrunner.py
+++ b/testrunner.py
@@ -209,10 +209,18 @@ class TestRunner(object):
self.teeCommand = winWhich('tee.exe')
if self.teeCommand is None:
git = winWhich('git.exe')
+ if not git:
+ # In COIN we have only git.cmd in path
+ git = winWhich('git.cmd')
if 'cmd' in git:
# Check for a MSYS-git installation with 'cmd' in the path and grab 'tee' from usr/bin
index = git.index('cmd')
- self.teeCommand = git[0:index] + 'usr\\bin\\tee.exe'
+ self.teeCommand = git[0:index] + 'bin\\tee.exe'
+ if not os.path.exists(self.teeCommand):
+ self.teeCommand = git[0:index] + 'usr\\bin\\tee.exe' # git V2.8.X
+ if not os.path.exists(self.teeCommand):
+ raise "Cannot locate 'tee' command"
+
else:
self.makeCommand = 'make'
self.teeCommand = 'tee'