diff options
author | 2015-06-01 23:40:18 -0700 | |
---|---|---|
committer | 2015-06-01 23:40:18 -0700 | |
commit | 86686746f6b3fc095cdf94868b4d9d82a86275c8 (patch) | |
tree | e9a54f3f9afdd7f63230b2bf0399971916d9e719 /tools | |
parent | cdfb24f4d96e9b47464d93d3a4857b7e8f2973ff (diff) | |
parent | b00aa67b3cced0da0b52089bfdea8d455be99900 (diff) |
Merge pull request #1860 from jtattermusch/csharp_runtest_windows
run_tests.py support for C# on windows
Diffstat (limited to 'tools')
-rw-r--r-- | tools/run_tests/run_csharp.bat | 16 | ||||
-rwxr-xr-x | tools/run_tests/run_tests.py | 20 |
2 files changed, 34 insertions, 2 deletions
diff --git a/tools/run_tests/run_csharp.bat b/tools/run_tests/run_csharp.bat new file mode 100644 index 0000000000..17c622cc2d --- /dev/null +++ b/tools/run_tests/run_csharp.bat @@ -0,0 +1,16 @@ +@rem Runs C# tests for given assembly from command line. The Grpc.sln solution needs to be built before running the tests. + +setlocal + +@rem enter this directory +cd /d %~dp0\..\..\src\csharp + +packages\NUnit.Runners.2.6.4\tools\nunit-console-x86.exe -labels "%1/bin/Debug/%1.dll" || goto :error + +endlocal + +goto :EOF + +:error +echo Failed! +exit /b %errorlevel% diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index b1cde27044..c00d7941f4 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -234,20 +234,36 @@ class RubyLanguage(object): class CSharpLanguage(object): + def __init__(self): + if platform.system() == 'Windows': + plat = 'windows' + else: + plat = 'posix' + self.platform = plat + def test_specs(self, config, travis): assemblies = ['Grpc.Core.Tests', 'Grpc.Examples.Tests', 'Grpc.IntegrationTesting'] - return [config.job_spec(['tools/run_tests/run_csharp.sh', assembly], + if self.platform == 'windows': + cmd = 'tools\\run_tests\\run_csharp.bat' + else: + cmd = 'tools/run_tests/run_csharp.sh' + return [config.job_spec([cmd, assembly], None, shortname=assembly, environ={'GRPC_TRACE': 'surface,batch'}) for assembly in assemblies ] def make_targets(self): + # For Windows, this target doesn't really build anything, + # everything is build by buildall script later. return ['grpc_csharp_ext'] def build_steps(self): - return [['tools/run_tests/build_csharp.sh']] + if self.platform == 'windows': + return [['src\\csharp\\buildall.bat']] + else: + return [['tools/run_tests/build_csharp.sh']] def supports_multi_config(self): return False |