infra/bots/recipe_modules/vars/api.py - Issue 2217523002: [recipes] Fixes for Coverage bot

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: infra/bots/recipe_modules/vars/api.py

Issue 2217523002: [recipes] Fixes for Coverage bot (Closed) Base URL: https://skia.googlesource.com/skia.git@merge_buildbot_spec_sub2

Patch Set: Fix compile env Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: infra/bots/recipe_modules/vars/api.py

diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py

index 897a85a7fc911794decc831656e57e3f44bdace9..092c3e62b7184409eda510f85f5cd236d7c583b3 100644

--- a/infra/bots/recipe_modules/vars/api.py

+++ b/infra/bots/recipe_modules/vars/api.py

@@ -151,12 +151,7 @@ def get_gyp_defines(builder_dict):

def get_extra_env_vars(builder_dict):

env = {}

- if builder_dict.get('configuration') == 'Coverage':

- # We have to use Clang 3.6 because earlier versions do not support the

- # compile flags we use and 3.7 and 3.8 hit asserts during compilation.

- env['CC'] = '/usr/bin/clang-3.6'

- env['CXX'] = '/usr/bin/clang++-3.6'

- elif builder_dict.get('compiler') == 'Clang':

+ if builder_dict.get('compiler') == 'Clang':

env['CC'] = '/usr/bin/clang'

env['CXX'] = '/usr/bin/clang++'