Support testing the dart2js compiler on the 64 bit vm

tools/bots/bot.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """
 Shared code for use in the buildbot scripts.
 """
 
@@ skipping 18 matching lines @@
   - runtime: 'd8', 'ie', 'ff', 'safari', 'chrome', 'opera', or None.
   - mode: 'debug' or 'release'.
   - system: 'linux', 'mac', or 'win7'.
   - checked: True if we should run in checked mode, otherwise False.
   - host_checked: True if we should run in host checked mode, otherwise False.
   - minified: True if we should minify the code, otherwise False
   - shard_index: The shard we are running, None when not specified.
   - total_shards: The total number of shards, None when not specified.
   - is_buildbot: True if we are on a buildbot (or emulating it).
   - test_set: Specification of a non standard test set or None.
+  - csp: This is using csp when running
+  - arch: The architecture to build on.
   """
   def __init__(self, compiler, runtime, mode, system, checked=False,
                host_checked=False, minified=False, shard_index=None,
                total_shards=None, is_buildbot=False, test_set=None,
-               csp=None):
+               csp=None, arch=None):
     self.compiler = compiler
     self.runtime = runtime
     self.mode = mode
     self.system = system
     self.checked = checked
     self.host_checked = host_checked
     self.minified = minified
     self.shard_index = shard_index
     self.total_shards = total_shards
     self.is_buildbot = is_buildbot
     self.test_set = test_set
     self.csp = csp
+    if (arch == None):
+      self.arch = 'ia32'
+    else:
+      self.arch=arch

[kustermann, 2013/08/19 13:25:32]

space around '='

[ricow1, 2013/08/20 10:25:50]

Done.

 
   def PrintBuildInfo(self):
     shard_description = ""
     if self.shard_index:
       shard_description = " shard %s of %s" % (self.shard_index,
                                                self.total_shards)
     print ("compiler: %s, runtime: %s mode: %s, system: %s,"
-           " checked: %s, host-checked: %s, minified: %s, test-set: %s%s"
+           " checked: %s, host-checked: %s, minified: %s, test-set: %s"
+           " arch: %s%s"
            ) % (self.compiler, self.runtime, self.mode, self.system,
                 self.checked, self.host_checked, self.minified, self.test_set,
-                shard_description)
+                self.arch, shard_description)
 
 
 class BuildStep(object):
   """
   A context manager for handling build steps.
 
   When the context manager is entered, it prints the "@@@BUILD_STEP __@@@"
   message. If it exits from an error being raised it displays the
   "@@@STEP_FAILURE@@@" message.
 
@@ skipping 18 matching lines @@
 
 def BuildSDK(build_info):
   """
   Builds the SDK.
 
   - build_info: the buildInfo object, containing information about what sort of
       build and test to be run.
   """
   with BuildStep('Build SDK'):
     args = [sys.executable, './tools/build.py', '--mode=' + build_info.mode,
-            'create_sdk']
+            '--arch=' + build_info.arch, 'create_sdk']
     print 'Building SDK: %s' % (' '.join(args))
     RunProcess(args)
 
 
 def RunBot(parse_name, custom_steps, build_step=BuildSDK):
   """
   The main function for running a buildbot.
 
   A buildbot script should invoke this once. The parse_name function will be
   called with the name of the buildbot and should return an instance of
@@ skipping 82 matching lines @@
   step_name = GetStepName(name, flags)
   with BuildStep(step_name):
     sys.stdout.flush()
 
     cmd = [
       sys.executable, os.path.join(os.curdir, 'tools', 'test.py'),
       '--step_name=' + step_name,
       '--mode=' + build_info.mode,
       '--compiler=' + build_info.compiler,
       '--runtime=' + build_info.runtime,
+      '--arch=' + build_info.arch,
       '--progress=buildbot',
       '-v', '--time', '--use-sdk', '--report'
     ]
 
     if build_info.checked:
       cmd.append('--checked')
 
     cmd.extend(flags)
     cmd.extend(targets)
 
@@ skipping 15 matching lines @@
   if exit_code != 0:
     raise OSError(exit_code)
 
 
 def GetStepName(name, flags):
   """
   Filters out flags with '=' as this breaks the /stats feature of the buildbot.
   """
   flags = [x for x in flags if not '=' in x]
   return ('%s tests %s' % (name, ' '.join(flags))).strip()