V8: Show build environment in failure logs

scripts/slave/recipe_modules/v8/api.py

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 d6467abbc762230755669639a0acbe853e127f60..a273bc7326c0b9ea4dfa9099ea6e9679329785ab 100644
--- a/scripts/slave/recipe_modules/v8/api.py
+++ b/scripts/slave/recipe_modules/v8/api.py
@@ -264,6 +264,23 @@ class V8Api(recipe_api.RecipeApi):
       env['GYP_MSVS_VERSION'] = self.m.chromium.c.gyp_env.GYP_MSVS_VERSION
     self.m.chromium.runhooks(env=env, **kwargs)
 
+  @property
+  def build_environment(self):
+    if self.m.properties.get('build_environment'):
+      return self.m.properties['build_environment']
+    build_environment = dict(
+        (k, v) for (k, v) in self.m.chromium.c.gyp_env.as_jsonish().iteritems()
+               if k.startswith('GYP') and v is not None
+    )
+    build_environment.update(self.c.gyp_env.as_jsonish())
+    if 'GYP_DEFINES' in build_environment:
+      # Filter out gomadir.
+      build_environment['GYP_DEFINES'] = ' '.join(
+          d for d in build_environment['GYP_DEFINES'].split()
+            if not d.startswith('gomadir')
+      )
+    return build_environment
+
   def setup_mips_toolchain(self):
     mips_dir = self.m.path['slave_build'].join(MIPS_DIR, 'bin')
     if not self.m.path.exists(mips_dir):
@@ -695,6 +712,11 @@ class V8Api(recipe_api.RecipeApi):
     lines.append('Flags: %s' % ' '.join(results[0]['flags']))
     lines.append('Command: %s' % results[0]['command'])
     lines.append('')
+    lines.append('Build environment:')
+    build_environment = self.build_environment
+    for i in sorted(build_environment):

[tandrii(chromium), 2016/04/20 14:58:24]

nit: s/i/k[ey]

[Michael Achenbach, 2016/04/21 14:41:33]

Done.

+      lines.append(' %s: %s' % (i, build_environment[i]))
+    lines.append('')
 
     # Add results for each run of a command.
     for result in sorted(results, key=lambda r: int(r['run'])):
@@ -945,6 +967,9 @@ class V8Api(recipe_api.RecipeApi):
       # TODO(machenbach): Also set meaningful buildbucket tags of triggering
       # parent.
 
+      # Pass build environment to testers.
+      properties['build_environment'] = self.build_environment

[tandrii(chromium), 2016/04/20 14:58:23]

can it potentially be so large so as not fitting into max property length? I've
hit it with try_recipe - i think it's VARCHAR(1023) :)

[Michael Achenbach, 2016/04/20 15:05:08]

I'll add a check. And I should also add a check that on tester bots, we only
make use of the data provided through a property as the one calculated from the
config is most likely wrong.

+
       swarm_hashes = self.m.isolate.isolated_tests
       if swarm_hashes:
         properties['swarm_hashes'] = swarm_hashes