From 61c3a83e9454b6ce80b8601c02f89fe9b4bfa4cb Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 27 Oct 2015 17:54:50 -0700 Subject: [PATCH] unbreak linux csharp gcov --- tools/run_tests/run_tests.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index b1f886f319c..39d7a0a9002 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -343,15 +343,17 @@ class CSharpLanguage(object): else: cmd = 'tools/run_tests/run_csharp.sh' - if not config.build_config == 'gcov': + if config.build_config == 'gcov' and self.platform == 'windows': + # For C# code coverage we need to: + # 1) Run all tests as one suite. + # 2) Need to be on Windows. + return [config.job_spec([cmd], None, + environ=_FORCE_ENVIRON_FOR_WRAPPERS)] + else: return [config.job_spec([cmd, assembly], None, shortname=assembly, environ=_FORCE_ENVIRON_FOR_WRAPPERS) for assembly in assemblies] - else: - # For code coverage we need to run all tests in one suite. - return [config.job_spec([cmd], None, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)] def pre_build_steps(self): if self.platform == 'windows':