Skip to content
Snippets Groups Projects
Commit ceb7318d authored by Nicolas Noble's avatar Nicolas Noble
Browse files

Merge pull request #4195 from adelez/fix_gcov

Skip OjbC when running code coverage.
parents 4dd8f439 6b9527c0
No related branches found
No related tags found
No related merge requests found
...@@ -624,10 +624,15 @@ build_configs = set(cfg.build_config for cfg in run_configs) ...@@ -624,10 +624,15 @@ build_configs = set(cfg.build_config for cfg in run_configs)
if args.travis: if args.travis:
_FORCE_ENVIRON_FOR_WRAPPERS = {'GRPC_TRACE': 'api'} _FORCE_ENVIRON_FOR_WRAPPERS = {'GRPC_TRACE': 'api'}
languages = set(_LANGUAGES[l] if 'all' in args.language:
for l in itertools.chain.from_iterable( lang_list = _LANGUAGES.keys()
_LANGUAGES.iterkeys() if x == 'all' else [x] else:
for x in args.language)) lang_list = args.language
# We don't support code coverage on ObjC
if 'gcov' in args.config and 'objc' in lang_list:
lang_list.remove('objc')
languages = set(_LANGUAGES[l] for l in lang_list)
if len(build_configs) > 1: if len(build_configs) > 1:
for language in languages: for language in languages:
...@@ -840,6 +845,7 @@ def _calculate_num_runs_failures(list_of_results): ...@@ -840,6 +845,7 @@ def _calculate_num_runs_failures(list_of_results):
num_failures += jobresult.num_failures num_failures += jobresult.num_failures
return num_runs, num_failures return num_runs, num_failures
def _build_and_run( def _build_and_run(
check_cancelled, newline_on_success, cache, xml_report=None): check_cancelled, newline_on_success, cache, xml_report=None):
"""Do one pass of building & running tests.""" """Do one pass of building & running tests."""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment