compile.py: explicitly pass gsutil.py path for uploading goma logs

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 181 matching lines @@
         goma_ctl_cmd + ['jsonstatus', options.goma_jsonstatus], env=env)
     goma_utils.SendGomaTsMon(options.goma_jsonstatus, -1)
 
   # Try to stop compiler_proxy so that it flushes logs and stores
   # GomaStats.
   if options.build_data_dir:
     env['GOMACTL_CRASH_REPORT_ID_FILE'] = os.path.join(options.build_data_dir,
                                                        'crash_report_id_file')
   chromium_utils.RunCommand(goma_ctl_cmd + ['stop'], env=env)
 
+  override_gsutil = None
+  if options.gsutil_py_path:
+    override_gsutil = [sys.executable, options.gsutil_py_path]
+
   # Upload compiler_proxy.INFO to investigate the reason of compiler_proxy
   # start-up failure.
-  goma_utils.UploadGomaCompilerProxyInfo()
+  goma_utils.UploadGomaCompilerProxyInfo(override_gsutil=override_gsutil)
   # Upload GomaStats to make it monitored.
   if env.get('GOMA_DUMP_STATS_FILE'):
     goma_utils.SendGomaStats(env['GOMA_DUMP_STATS_FILE'],
                              env.get('GOMACTL_CRASH_REPORT_ID_FILE'),
                              options.build_data_dir)
 
   if options.goma_disable_local_fallback:
     print 'error: failed to start goma; fallback has been disabled'
     raise Exception('failed to start goma')
 
   print 'warning: failed to start goma. falling back to non-goma'
   # Drop goma from options.compiler
   options.compiler = options.compiler.replace('goma-', '')
   if options.compiler == 'goma':
     options.compiler = None
   # Reset options.goma_dir.
   options.goma_dir = None
   env['GOMA_DISABLED'] = '1'
   return False
 
 
 def goma_teardown(options, env, exit_status):
   """Tears down goma if necessary. """
   if (options.compiler in ('goma', 'goma-clang') and
       options.goma_dir):
+    override_gsutil = None
+    if options.gsutil_py_path:
+      override_gsutil = [sys.executable, options.gsutil_py_path]
+
     # If goma compiler_proxy crashes during the build, there could be crash
     # dump.
     if options.build_data_dir:
       env['GOMACTL_CRASH_REPORT_ID_FILE'] = os.path.join(options.build_data_dir,
                                                          'crash_report_id_file')
     goma_ctl_cmd = [sys.executable,
                     os.path.join(options.goma_dir, 'goma_ctl.py')]
     if options.goma_jsonstatus:
       chromium_utils.RunCommand(
           goma_ctl_cmd + ['jsonstatus', options.goma_jsonstatus], env=env)
       goma_utils.SendGomaTsMon(options.goma_jsonstatus, exit_status)
     # Always stop the proxy for now to allow in-place update.
     chromium_utils.RunCommand(goma_ctl_cmd + ['stop'], env=env)
-    goma_utils.UploadGomaCompilerProxyInfo()
+    goma_utils.UploadGomaCompilerProxyInfo(override_gsutil=override_gsutil)
     if env.get('GOMA_DUMP_STATS_FILE'):
       goma_utils.SendGomaStats(env['GOMA_DUMP_STATS_FILE'],
                                env.get('GOMACTL_CRASH_REPORT_ID_FILE'),
                                options.build_data_dir)
 
 
 def common_xcode_settings(command, options, env, compiler=None):
   """
   Sets desirable Mac environment variables and command-line options
   that are common to the Xcode builds.
@@ skipping 698 matching lines @@
       if not filter_obj.was_up_to_date:
         print 'Failing build because ninja reported work to do.'
         print 'This means that after completing a compile, another was run and'
         print 'it resulted in still having work to do (that is, a no-op build'
         print 'wasn\'t a no-op). Consult the first "ninja explain:" line for a'
         print 'likely culprit.'
         return 1
     return exit_status
   finally:
     goma_teardown(options, env, exit_status)
+
+    override_gsutil = None
+    if options.gsutil_py_path:
+      override_gsutil = [sys.executable, options.gsutil_py_path]
+
     goma_utils.UploadNinjaLog(
-        options.target_output_dir, options.compiler, command, exit_status)
+        options.target_output_dir, options.compiler, command, exit_status,
+        override_gsutil=override_gsutil)
 
 
 def main_win(options, args):
   """Interprets options, clobbers object files, and calls the build tool.
   """
   if not options.solution:
     options.solution = 'all.sln'
   solution = os.path.join(options.build_dir, options.solution)
 
   # Prefer the version specified in the .sln. When devenv.com is used at the
@@ skipping 271 matching lines @@
   option_parser.add_option('--goma-enable-compiler-info-cache',
                            action='store_true',
                            help='Enable goma CompilerInfo cache')
   option_parser.add_option('--goma-store-local-run-output', default=None,
                            help='Store local run output to goma servers.')
   option_parser.add_option('--goma-fail-fast', action='store_true')
   option_parser.add_option('--goma-disable-local-fallback', action='store_true')
   option_parser.add_option('--goma-jsonstatus',
                            help='Specify a file to dump goma_ctl jsonstatus.')
   option_parser.add_option('--verbose', action='store_true')
+  option_parser.add_option('--gsutil-py-path',
+                           help='Specify path to gsutil.py script.')
   option_parser.add_option('--ninja-path', default='ninja',
                            help='Specify path to the ninja tool.')
   option_parser.add_option('--ninja-ensure-up-to-date', action='store_true',
                            help='Checks the output of the ninja builder to '
                                 'confirm that a second compile immediately '
                                 'the first is a no-op.')
 
   options, args = option_parser.parse_args()
 
   if not options.src_dir:
@@ skipping 64 matching lines @@
       sys.stderr.write('Unknown build tool %s.\n' % repr(options.build_tool))
       return 2
 
   options.target_output_dir = get_target_build_dir(args, options)
 
   return main(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(real_main())