Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(997)

Unified Diff: scripts/slave/recipe_modules/v8/api.py

Issue 2087933006: V8: Fix gyp flag comparison for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/v8/api.py
diff --git a/scripts/slave/recipe_modules/v8/api.py b/scripts/slave/recipe_modules/v8/api.py
index 9e54ede24d278b77f79e554f8d5b713db1af9312..c0b1b2fe9abbc93c2044e35eeb3f3467378ec389 100644
--- a/scripts/slave/recipe_modules/v8/api.py
+++ b/scripts/slave/recipe_modules/v8/api.py
@@ -432,12 +432,20 @@ class V8Api(recipe_api.RecipeApi):
infra_flags = gyp_defines_to_dict(
self.m.chromium.c.gyp_env.as_jsonish()['GYP_DEFINES'])
- # Get the client's gyp flags from MB's output.
- match = re.search('^GYP_DEFINES=\'(.*)\'$', mb_output, re.M)
+ # Get the client's gyp flags from MB's output. Group 1 captures with posix,
+ # group 2 with windows output semantics.
+ #
+ # Posix:
+ # GYP_DEFINES='foo=1 path=a/b/c'
+ #
+ # Windows:
+ # set GYP_DEFINES=foo=1 path='a/b/c'
+ match = re.search(
+ '^(?:set )?GYP_DEFINES=(?:(?:\'(.*)\')|(?:(.*)))$', mb_output, re.M)
# This won't match in the gn case.
if match:
- client_flags = gyp_defines_to_dict(match.group(1))
+ client_flags = gyp_defines_to_dict(match.group(1) or match.group(2))
# Tweak both dictionaries for known differences.
if infra_flags.get('target_arch') == infra_flags.get('v8_target_arch'):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698