Stop to use contextmanager for goma.build_with_goma

scripts/slave/recipe_modules/goma/api.py

 # Copyright 2015 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 contextlib import contextmanager
 
 from recipe_engine import recipe_api
 
 class GomaApi(recipe_api.RecipeApi):
@@ skipping 67 matching lines @@
 
     return self._goma_jobs
 
   def remove_j_flag(self, command):
     """Remove -j flag from command.
     This function elimitnates -j flag from command for
     '-j', '80' style and '-j80' style.
 
     Args:
       command: List of command line arg.
+
+    Returns:
+      list(string): Command line args parallel option removed.
     """
+    command = command[:]
     parallel_flag_regexp = re.compile('-j\d*')
     for i in range(len(command)):
       if (isinstance(command[i], str) and
           parallel_flag_regexp.match(command[i])):
         if command[i] == '-j':
           command.pop(i + 1)
         command.pop(i)
-        return
+        break
+    return command
 
   def ensure_goma(self, canary=False):
     with self.m.step.nest('ensure_goma'):
       with self.m.step.context({'infra_step': True}):
         try:
           self.m.cipd.set_service_account_credentials(
               self.service_account_json_path)
 
           self.m.cipd.install_client()
           goma_package = ('infra_internal/goma/client/%s' %
@@ skipping 210 matching lines @@
                       ninja_log_command=None, env=None,
                       allow_build_without_goma=False):
     """Make context wrapping goma start/stop.
 
     Args ninja_log_* are NOT used to run actual build in this context.
     These args are only used to collect log and upload them.
 
     Args:
       ninja_log_outdir: Directory of ninja log. (e.g. "out/Release")
       ninja_log_compiler: Compiler used in ninja. (e.g. "clang")
       ninja_log_command: Command used for build.

[ukai, 2016/11/08 04:11:57]

could be ninja_command ?

[tikuta, 2016/11/09 05:31:12]

Done.

                          This is used only to be sent as part of log,
                          NOT used to run actual build.

[ukai, 2016/11/08 04:11:57]

fix comment?

[tikuta, 2016/11/09 05:31:12]

Done.

                          (e.g. ['ninja', '-C', 'out/Release', '-j', '100'])
       env: Environment controlling goma behavior.
            This should be used for ninja if allow_build_without_goma is True.
            Otherwise, only used for goma behavior control.
       allow_build_without_goma (bool):
         If this is not True, goma starting failure is ignored.
         This argument should be used with env.
         If starting goma fails, env and ninja_log_command are modified.

[ukai, 2016/11/08 04:11:57]

update comment?

[tikuta, 2016/11/09 05:31:12]

Done.

 
+    Returns:
+      (env_update, command):
+        Please use env_update and command for ninja in build_with_goma context
+        (e.g. ninja_env.update(env_update)).
+        Appropriate values are set when starting goma fails.
+
     Raises:
       StepFailure or InfraFailure if it fails to build.
     """
     ninja_log_exit_status = 0
-
     if allow_build_without_goma:
       assert(env is not None)
+      assert(ninja_log_command is not None)
+      env = env.copy()
+      ninja_log_command = ninja_log_command[:]
+
       try:
         self.start(env)
       except:
-        env['GOMA_DISABLED'] = 'true'
-        self.remove_j_flag(ninja_log_command)
+        ninja_log_command = self.remove_j_flag(ninja_log_command)
         try:
-          yield
+          yield ({'GOMA_DISABLED':'true'}, ninja_log_command)
         except self.m.step.StepFailure as e: # pragma: no cover
           ninja_log_exit_status = e.retcode
           raise e
         except self.m.step.InfraFailure as e: # pragma: no cover
           ninja_log_exit_status = -1
           raise e
         finally:
           self._upload_logs(ninja_log_outdir=ninja_log_outdir,
                             ninja_log_compiler=ninja_log_compiler,
                             ninja_log_command=ninja_log_command,
                             ninja_log_exit_status=ninja_log_exit_status,
                             name='upload log goma start failed')
         return
     else:
       self.start(env)
 
     try:
-      yield
+      yield ({}, ninja_log_command)
     except self.m.step.StepFailure as e: # pragma: no cover
       ninja_log_exit_status = e.retcode
       raise e
     except self.m.step.InfraFailure as e: # pragma: no cover
       ninja_log_exit_status = -1
       raise e
     finally:
       self.stop(ninja_log_outdir=ninja_log_outdir,
                 ninja_log_compiler=ninja_log_compiler,
                 ninja_log_command=ninja_log_command,
                 ninja_log_exit_status=ninja_log_exit_status)