Revert r9440. Turned the web-chrome-win7 bot red but I can't log

utils/compiler/buildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 """Dart frog buildbot steps
 
 Runs tests for the frog or dart2js compiler.
 """
@@ skipping 36 matching lines @@
   args, _ = parser.parse_args()
 
   compiler = None
   runtime = None
   mode = None
   system = None
   builder_name = os.environ.get(BUILDER_NAME)
   option = None
   shard_index = None
   total_shards = None
-  is_buildbot = True
   if not builder_name:
     # We are not running on a buildbot.
-    is_buildbot = False
     if args.name:
       builder_name = args.name
     else:
       print 'Use -n $BUILDBOT_NAME for the bot you would like to emulate.'
       sys.exit(1)
 
   if builder_name:
     dart2js_pattern = re.match(DART2JS_BUILDER, builder_name)
     frog_pattern = re.match(FROG_BUILDER, builder_name)
     web_pattern = re.match(WEB_BUILDER, builder_name)
@@ skipping 23 matching lines @@
 
   if system == 'windows':
     system = 'win7'
 
   if (system == 'win7' and platform.system() != 'Windows') or (
       system == 'mac' and platform.system() != 'Darwin') or (
       system == 'linux' and platform.system() != 'Linux'):
     print ('Error: You cannot emulate a buildbot with a platform different '
         'from your own.')
     sys.exit(1)
-  return (compiler, runtime, mode, system, option, shard_index, total_shards,
-          is_buildbot)
+  return (compiler, runtime, mode, system, option, shard_index, total_shards)
 
 
 def NeedsXterm(compiler, runtime):
   return runtime in ['ie', 'chrome', 'safari', 'opera', 'ff', 'drt']
 
 def TestStep(name, mode, system, compiler, runtime, targets, flags):
   print '@@@BUILD_STEP %s %s tests: %s %s@@@' % (name, compiler, runtime,
       ' '.join(flags))
   sys.stdout.flush()
   if NeedsXterm(compiler, runtime) and system == 'linux':
@@ skipping 46 matching lines @@
         shutil.rmtree('frog/%s' % outdir, ignore_errors=True)
         shutil.rmtree('runtime/%s' % outdir, ignore_errors=True)
 
   os.chdir(DART_PATH)
 
   args = [sys.executable, './tools/build.py', '--mode=' + mode, 'create_sdk']
   print 'running %s' % (' '.join(args))
   return subprocess.call(args, env=NO_COLOR_ENV)
 
 
-def TestCompiler(compiler, runtime, mode, system, option, flags, is_buildbot):
+def TestCompiler(compiler, runtime, mode, system, option, flags):
   """ test the compiler.
    Args:
      - compiler: either 'dart2js' or 'frog'
      - runtime: either 'd8', or one of the browsers, see GetBuildInfo
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
      - option: 'checked'
      - flags: extra flags to pass to test.dart
-     - is_buildbot: true if we are running on a real buildbot instead of
-       emulating one.
   """
 
   # Make sure we are in the frog directory
   os.chdir(DART_PATH)
 
   if system.startswith('win') and runtime == 'ie':
     # We don't do proper sharding on the IE bots, since the runtime is
     # long for both. We have a "fast bot" and a "slow bot" that run specific
     # tests instead.
     for i in flags:
       if i.startswith('--shard='):
         bot_num = i.split('=')[1]
     # There should not be more than one InternetExplorerDriver instance
     # running at a time. For details, see
     # http://code.google.com/p/selenium/wiki/InternetExplorerDriver.
     flags = (filter(lambda(item): not item.startswith('--shard'), flags) +
         ['-j1'])
 
-  def GetPath(runtime):
-    """ Helper to get the path to the Chrome or Firefox executable for a
-    particular platform on the buildbot. Throws a KeyError if runtime is not
-    either 'chrome' or 'ff'."""
-    if system == 'mac':
-      partDict = {'chrome': 'Google\\ Chrome', 'ff': 'Firefox'}
-      mac_path = '/Applications/%s.app/Contents/MacOS/%s'
-      path_dict = {'chrome': mac_path % (partDict[runtime], partDict[runtime]),
-          'ff': mac_path % (partDict[runtime], partDict[runtime].lower())}
-    elif system == 'linux':
-      path_dict = {'ff': 'firefox', 'chrome': 'google-chrome'}
-    else:
-      # Windows.
-      path_dict = {'ff': os.path.join('C:', 'Program Files (x86)',
-          'Mozilla Firefox', 'firefox.exe'),
-          'chrome': os.path.join('C:', 'Users', 'chrome-bot', 'AppData',
-          'Local', 'Google', 'Chrome', 'Application', 'chrome.exe')}
-    return path_dict[runtime]
-
-  if ((runtime == 'ff' or runtime == 'chrome') and is_buildbot and
-      not (runtime == 'chrome' and system == 'linux')): # chrome-linux runs drt.
-    # Print out browser version numbers if we're running on the buildbot (where
-    # we know the paths to these browser installations).
-    p = subprocess.Popen('%s --version' % GetPath(runtime),
-        stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    output, stderr = p.communicate()
-    print 'Version of %s: %s' % (runtime, output)
-
   if system == 'linux' and runtime == 'chrome':
     # TODO(ngeoffray): We should install selenium on the buildbot.
     runtime = 'drt'
 
   if compiler == 'dart2js':
     if option == 'checked': flags = flags + ['--host-checked']
 
     if runtime == 'd8':
       # The dart2js compiler isn't self-hosted (yet) so we run its
       # unit tests on the VM. We avoid doing this on the builders
@@ skipping 61 matching lines @@
     _DeleteFirefoxProfiles('/tmp')
     _DeleteFirefoxProfiles('/var/tmp')
 
 def main():
   print '@@@BUILD_STEP build sdk@@@'
 
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
-  (compiler, runtime, mode, system, option, shard_index, total_shards,
-      is_buildbot) = GetBuildInfo()
+  compiler, runtime, mode, system, option, shard_index, total_shards = (
+      GetBuildInfo())
   shard_description = ""
   if shard_index:
     shard_description = " shard %s of %s" % (shard_index, total_shards)
   print "compiler: %s, runtime: %s mode: %s, system: %s, option: %s%s" % (
       compiler, runtime, mode, system, option, shard_description)
   if compiler is None:
     return 1
 
   status = BuildSDK(mode, system)
   if status != 0:
     print '@@@STEP_FAILURE@@@'
     return status
 
   test_flags = []
   if shard_index:
     test_flags = ['--shards=%s' % total_shards, '--shard=%s' % shard_index]
 
   # First we run all the regular tests.
-  status = TestCompiler(compiler, runtime, mode, system, option, test_flags,
-                        is_buildbot)
+  status = TestCompiler(compiler, runtime, mode, system, option, test_flags)
 
   # We only run checked mode tests when the host is not in checked mode.
   if status == 0 and option != 'checked' and runtime == 'd8':
     status = TestCompiler(compiler, runtime, mode, system, option,
-                          test_flags + ['--checked'], is_buildbot)
+                          test_flags + ['--checked'])
 
   if runtime != 'd8': CleanUpTemporaryFiles(system, runtime)
   if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
 if __name__ == '__main__':
   sys.exit(main())