diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-29 15:43:54 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-29 15:43:54 -0800 |
| commit | f657a502131621249f71ea0b2d94e03a0952eade (patch) | |
| tree | a2243a22f00ceded9e865534b72a7277ea8c7621 /tools | |
| parent | 323ec9b46bb1510f7a79a7eeb7e65c5fa40f9785 (diff) | |
| parent | 3f1aa9b99ae6752cc22cab2707b1d8c3846f21be (diff) | |
Merge pull request #5466 from jtattermusch/csharp_win_distribtest
Windows C# distribtests
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/distribtest_targets.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py index 933103f0a0..34cc1cd710 100644 --- a/tools/run_tests/distribtest_targets.py +++ b/tools/run_tests/distribtest_targets.py @@ -96,6 +96,15 @@ class CSharpDistribTest(object): return create_jobspec(self.name, ['test/distrib/csharp/run_distrib_test.sh'], environ={'EXTERNAL_GIT_ROOT': '../../..'}) + elif self.platform == 'windows': + if self.arch == 'x64': + environ={'MSBUILD_EXTRA_ARGS': '/p:Platform=x64', + 'DISTRIBTEST_OUTPATH': 'DistribTest\\bin\\x64\\Debug'} + else: + environ={'DISTRIBTEST_OUTPATH': 'DistribTest\\bin\\\Debug'} + return create_jobspec(self.name, + ['test\\distrib\\csharp\\run_distrib_test.bat'], + environ=environ) else: raise Exception("Not supported yet.") @@ -240,6 +249,8 @@ def targets(): CSharpDistribTest('linux', 'x64', 'ubuntu1510'), CSharpDistribTest('linux', 'x64', 'ubuntu1604'), CSharpDistribTest('macos', 'x86'), + CSharpDistribTest('windows', 'x86'), + CSharpDistribTest('windows', 'x64'), PythonDistribTest('linux', 'x64', 'wheezy'), PythonDistribTest('linux', 'x64', 'jessie'), PythonDistribTest('linux', 'x86', 'jessie'), |