Re-enable DepsCache using GOMA_DEPS_CACHE_FILE

scripts/slave/recipe_modules/chromium/api.py

 # Copyright 2013 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.
 
 import re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder):
@@ skipping 166 matching lines @@
       '--goma-cache-dir', self.m.path['goma_cache'],
     ]
 
     # Set some buildbot info used in goma_utils.
     for key in ['buildername', 'mastername', 'slavename', 'clobber']:
       if key in self.m.properties:
         args.extend([
             '--buildbot-%s' % key, self.m.properties[key]
         ])
 
     # Use explicit goma deps cache dir if it's set in the path config.

[ukai, 2016/10/04 01:24:43]

update comment?

[shinyak, 2016/10/04 08:19:16]

Removed the comment.

     # Otherwise use the default one inside build output directory.
     try:
-      args.extend(['--goma-deps-cache-dir', self.m.path['goma_deps_cache']])
-    except KeyError:
+      safe_buildername = re.sub(r'[^a-zA-Z0-9]', '_',
+                                self.m.properties['buildername']) + '.gomadeps'
+      args.extend(['--goma-deps-cache-file', safe_buildername])
+    except KeyError:  # pragma: nocover

[Paweł Hajdan Jr., 2016/10/03 10:04:54]

Could you remove the try-except? We could get KeyError on goma_deps_cache, but
we no longer use it.

[shinyak, 2016/10/04 08:19:16]

Done.

       pass
 
     if self.c.compile_py.build_args:
       args += ['--build-args', self.c.compile_py.build_args]
     if self.m.properties.get('build_data_dir'):
       args += ['--build-data-dir', self.m.properties.get('build_data_dir')]
     if self.c.compile_py.compiler:
       args += ['--compiler', self.c.compile_py.compiler]
       if 'goma' in self.c.compile_py.compiler:
         args += [
@@ skipping 623 matching lines @@
       }))
 
   def get_annotate_by_test_name(self, test_name):
     return 'graphing'
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))