Enable goma on pdfium buildbots.

scripts/slave/recipes/pdfium.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'depot_tools/gclient',
   'depot_tools/bot_update',
+  'goma',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/step',
 ]
 
 from recipe_engine.recipe_api import Property
 
 PROPERTIES = {
   'skia': Property(default=False, kind=bool),
   'xfa': Property(default=False, kind=bool),
   'memory_tool': Property(default=None, kind=str),
   'v8': Property(default=True, kind=bool),
   'target_cpu': Property(default=None, kind=str),
   'clang': Property(default=False, kind=bool),
   'rel': Property(default=False, kind=bool),
   'skip_test': Property(default=False, kind=bool),
   'target_os': Property(default=None, kind=str),
+  'goma': Property(default=True, kind=bool),

[Paweł Hajdan Jr., 2016/09/07 16:02:10]

Why is goma being added as build property?

If it's intended as temporary, please add a TODO.

[tikuta, 2016/09/13 09:30:11]

Removed

 }
 
 def _CheckoutSteps(api, memory_tool, skia, xfa, v8, target_cpu, clang,
                    target_os):
   # Checkout pdfium and its dependencies (specified in DEPS) using gclient.
   api.gclient.set_config('pdfium')
   if target_os:
     api.gclient.c.target_os = {target_os}
   api.bot_update.ensure_checkout(force=True)
 
   api.gclient.runhooks()
 
 
 def _GNGenBuilds(api, memory_tool, skia, xfa, v8, target_cpu, clang, rel,
-                 target_os, out_dir):
+                 target_os, goma, out_dir):
   gn_bool = {True: 'true', False: 'false'}
   # Generate build files by GN.
   checkout = api.path['checkout']
   gn_cmd = api.path['depot_tools'].join('gn.py')
 
   # Prepare the arguments to pass in.
   args = [
       'is_debug=%s' % gn_bool[not rel],
       'is_component_build=false',
       'pdf_enable_v8=%s' % gn_bool[v8],
       'pdf_enable_xfa=%s' % gn_bool[xfa],
       'pdf_use_skia=%s' % gn_bool[skia],
       'pdf_is_standalone=true',
+      'use_goma=%s' % gn_bool[goma],
   ]
   if api.platform.is_win and not memory_tool:
     args.append('symbol_level=1')
   if api.platform.is_linux:
     args.append('use_sysroot=false')
   if clang:
     args.append('is_clang=true')
   if memory_tool == 'asan':
     args.append('is_asan=true')
   if target_os:
     args.append('target_os="%s"' % target_os)
   if target_cpu == 'x86':
     args.append('target_cpu="x86"')
 
   api.python('gn gen', gn_cmd,
              ['--root=' + str(checkout), 'gen', '//out/' + out_dir,
               '--args=' + ' '.join(args)],
              cwd=checkout)
 
-def _BuildSteps(api, out_dir):
+def _BuildSteps(api, goma, clang, out_dir):
+  if goma:
+    api.goma.ensure_goma()
+    api.goma.start()
+
   # Build sample file using Ninja
   debug_path = api.path['checkout'].join('out', out_dir)
-  api.step('compile with ninja', ['ninja', '-C', debug_path])
+  ninja_cmd = ['ninja', '-C', debug_path]
+  if goma:
+    ninja_cmd.extend(['-j', api.goma.recommended_goma_jobs])
+  step_result = api.step('compile with ninja', ninja_cmd)
+
+  if goma:

[Paweł Hajdan Jr., 2016/09/07 16:02:10]

Instead of two "if goma" blocks, could you introduce a context manager? "with
goma.(pick-a-name):" that would ensure goma is stopped on exiting the block.

[Dirk Pranke, 2016/09/08 22:01:56]

Paweł, as far as I know we don't do this anywhere else (or, generally, worry
about stopping goma at all).

Am I wrong?

[Paweł Hajdan Jr., 2016/09/09 08:56:55]

I was mostly thinking about duplicated "if goma" and the interface than really
ensuring goma is stopped.

I'd be technically fine with this, it's more of a nit really. I'm more concerned
about adding a "goma" build property above.

[tikuta, 2016/09/13 09:30:11]

use build_with_goma context

+    api.goma.stop(
+        ninja_log_outdir=debug_path,
+        ninja_log_compiler= 'clang' if clang else 'unknown',
+        ninja_log_command=ninja_cmd,
+        ninja_log_exit_status=step_result.retcode,
+    )
 
 
 def _RunDrMemoryTests(api, v8):
   pdfium_tests_py = str(api.path['checkout'].join('tools',
                                                   'drmemory',
                                                   'scripts',
                                                   'pdfium_tests.py'))
   api.python('unittests', pdfium_tests_py,
              args=['--test', 'pdfium_unittests'],
              cwd=api.path['checkout'])
@@ skipping 50 matching lines @@
   api.python('pixel tests', pixel_tests_path, script_args,
              cwd=api.path['checkout'], env=env)
 
   corpus_tests_path = str(api.path['checkout'].join('testing', 'tools',
                                                     'run_corpus_tests.py'))
   api.python('corpus tests', corpus_tests_path, script_args,
              cwd=api.path['checkout'], env=env)
 
 
 def RunSteps(api, memory_tool, skia, xfa, v8, target_cpu, clang, rel, skip_test,
-             target_os):
+             target_os, goma):
   _CheckoutSteps(api, memory_tool, skia, xfa, v8, target_cpu, clang, target_os)
 
   out_dir = 'Release' if rel else 'Debug'
 
   _GNGenBuilds(api, memory_tool, skia, xfa, v8, target_cpu, clang, rel,
-               target_os, out_dir)
+               target_os, goma, out_dir)
 
-  _BuildSteps(api, out_dir)
+  _BuildSteps(api, goma, clang, out_dir)
 
   if skip_test:
     return
 
   with api.step.defer_results():
     _RunTests(api, memory_tool, v8, out_dir)
 
 
 def GenTests(api):
   yield (
@@ skipping 205 matching lines @@
 
   yield (
       api.test('android') +
       api.platform('linux', 64) +
       api.properties(mastername='client.pdfium',
                      buildername='android',
                      slavename='test_slave',
                      target_os='android',
                      skip_test=True)
   )