From e82435922df57b9dc98c0fd0fbe3b830c0724c41 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 17 Apr 2015 14:14:01 -0700 Subject: fixes to run_tests.py to at least start building tests on Windows --- tools/run_tests/jobset.py | 4 +++- tools/run_tests/run_tests.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index efe040aeb6..b8b4cf0001 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -144,7 +144,7 @@ def which(filename): class JobSpec(object): """Specifies what to run for a job.""" - def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, cwd=None): + def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, cwd=None, shell=False): """ Arguments: cmdline: a list of arguments to pass as the command line @@ -161,6 +161,7 @@ class JobSpec(object): self.shortname = cmdline[0] if shortname is None else shortname self.hash_targets = hash_targets or [] self.cwd = cwd + self.shell = shell def identity(self): return '%r %r %r' % (self.cmdline, self.environ, self.hash_targets) @@ -187,6 +188,7 @@ class Job(object): stderr=subprocess.STDOUT, stdout=self._tempfile, cwd=spec.cwd, + shell=spec.shell, env=env) self._state = _RUNNING self._newline_on_success = newline_on_success diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 8c8e78d859..4e24f4b510 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -346,8 +346,8 @@ if len(build_configs) > 1: if platform.system() == 'Windows': def make_jobspec(cfg, targets): - return jobset.JobSpec(['nmake', '/f', 'Grpc.mak', 'CONFIG=%s' % cfg] + targets, - cwd='vsprojects\\vs2013') + return jobset.JobSpec(['make.bat', 'CONFIG=%s' % cfg] + targets, + cwd='vsprojects', shell=True) else: def make_jobspec(cfg, targets): return jobset.JobSpec(['make', -- cgit v1.2.3