From e82435922df57b9dc98c0fd0fbe3b830c0724c41 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Fri, 17 Apr 2015 14:14:01 -0700
Subject: [PATCH] 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 ++--
vsprojects/README.md | 11 ++++++++---
vsprojects/make.bat | 7 +++++--
4 files changed, 18 insertions(+), 8 deletions(-)
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',
diff --git a/vsprojects/README.md b/vsprojects/README.md
index 7026bf7704..e30b99c7b8 100644
--- a/vsprojects/README.md
+++ b/vsprojects/README.md
@@ -19,9 +19,14 @@ After that, open `grpc.sln` with Visual Studio and hit "Build".
#Testing
-Use `make.bat` to build gRPC tests.
+Use `run_tests.py`, that also supports Windows (with a bit limited experience).
```
-make.bat test
+REM Run from repository root.
+python tools\run_tests\run_tests.py -l c
```
-
+Also, you can `make.bat` directly to build and run gRPC tests.
+```
+REM Run from this directory.
+make.bat alarm_test
+```
\ No newline at end of file
diff --git a/vsprojects/make.bat b/vsprojects/make.bat
index 4e17b40fcf..782952f944 100644
--- a/vsprojects/make.bat
+++ b/vsprojects/make.bat
@@ -2,8 +2,11 @@
@rem Usage: make.bat TARGET_NAME
setlocal
-@rem Set VS variables
+@rem Set VS variables (uses Visual Studio 2013)
@call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86
-nmake.exe /f Grpc.mak %1
+echo %*
+
+nmake /f Grpc.mak %*
+exit /b %ERRORLEVEL%
endlocal
\ No newline at end of file
--
GitLab