Increase timeout limit when running on VM --enable_type_checks.

dart/frog/scripts/buildbot_annotated_steps.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 compiler (running on the vm or the self-hosting version)
 """
 
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 BUILDER_NAME = 'BUILDBOT_BUILDERNAME'
 
-FROG_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+DART_PATH = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 FROG_BUILDER = r'(frog|frogsh)-(linux|mac|windows)-(debug|release)'
 WEB_BUILDER = r'web-(ie|ff|safari|chrome|opera)-(win7|win8|mac|linux)(-(\d+))?'
 
 NO_COLOR_ENV = dict(os.environ)
 NO_COLOR_ENV['TERM'] = 'nocolor'
 
 def GetBuildInfo():
   """Returns a tuple (name, mode, system) where:
     - name: 'frog', 'frogsh', 'frogium', or None when the builder has an
@@ skipping 37 matching lines @@
   return component in ['frogsh', 'frogium', 'legium', 'webdriver']
 
 def TestStep(name, mode, system, component, targets, flags):
   print '@@@BUILD_STEP %s tests: %s %s@@@' % (name, component, ' '.join(flags))
   sys.stdout.flush()
   if ComponentsNeedsXterm(component) and system == 'linux':
     cmd = ['xvfb-run', '-a']
   else:
     cmd = []
 
-  cmd = (cmd
-      + [sys.executable,
-          os.path.join('..', 'tools', 'test.py'),
-          '--mode=' + mode,
-          '--component=' + component,
-          '--time',
-          '--report',
-          '--progress=buildbot',
-          '-v']
-      + targets)
+  cmd.extend([sys.executable,
+              os.path.join(os.curdir, 'tools', 'test.py'),
+              '--mode=' + mode,
+              '--component=' + component,
+              '--time',
+              '--report',
+              '--progress=buildbot',
+              '-v'])
   if flags:
     cmd.extend(flags)
+  cmd.extend(targets)
 
+  print 'running %s' % (' '.join(cmd))

[Emily Fortuna, 2012/03/13 17:11:32]

Do we want this print statement here?

[ahe, 2012/03/14 07:26:26]

I think we do. I have heard complaints that it is hard to figure out what our
build bots are doing. This is an attempt to make it easier. 

   exit_code = subprocess.call(cmd, env=NO_COLOR_ENV)
   if exit_code != 0:
     print '@@@STEP_FAILURE@@@'
   return exit_code
 
 
 def BuildFrog(component, mode, system):
   """ build frog.
    Args:
      - component: either 'leg', 'frog', 'frogsh' (frog self-hosted), 'frogium'
        or 'legium'
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
   """
 
-  # Make sure we are in the frog directory
-  os.chdir(FROG_PATH)
+  os.chdir(DART_PATH)
 
   print '@@@BUILD_STEP build frog@@@'
 
-  args = [sys.executable, '../tools/build.py', '--mode=' + mode]
+  args = [sys.executable, './tools/build.py', '--mode=' + mode]
   return subprocess.call(args, env=NO_COLOR_ENV)
 
 
 def TestFrog(component, mode, system, browser, flags):
   """ test frog.
    Args:
      - component: either 'leg', 'frog', 'frogsh' (frog self-hosted), 'frogium',
        or 'legium'
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
      - browser: one of the browsers, see GetBuildInfo
      - flags: extra flags to pass to test.dart
   """
 
   # Make sure we are in the frog directory
-  os.chdir(FROG_PATH)
+  os.chdir(DART_PATH)
 
   if component != 'frogium': # frog and frogsh
+    if (component == 'frog' and mode == 'release'):
+      flags.append('--timeout=120')
     TestStep("frog", mode, system, component, [], flags)
     TestStep("frog_extra", mode, system,
         component, ['frog', 'frog_native', 'peg', 'css'], flags)
     TestStep("sdk", mode, system,
         'vm', ['dartdoc'], flags)
 
     if not '--checked' in flags:
       TestStep("leg", mode, system, 'leg', [], flags)
       TestStep("leg_extra", mode, system, 'leg',
                ['leg_only', 'frog_native'], flags)
@@ skipping 89 matching lines @@
   if status != 0:
     print '@@@STEP_FAILURE@@@'
 
   if component == 'frogium':
     CleanUpTemporaryFiles(system, browser)
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())