Subzero: Add x86-64 to the bots.

buildbot/buildbot_pnacl.py

 #!/usr/bin/python
 # Copyright (c) 2013 The Native Client 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 os
 import sys
 
 from buildbot_lib import (
     BuildContext, BuildStatus, Command, ParseStandardCommandLine,
@@ skipping 42 matching lines @@
     flags_run.extend(['naclsdk_validate=0', 'built_elsewhere=1'])
 
   if not context['skip_build']:
     # For ARM builders which will trigger hardware testers, run the hello world
     # test with the emulator as a basic sanity check before doing anything else.
     if arch == 'arm' and context['skip_run']:
         with Step('hello_world ' + arch, status):
           SCons(context, parallel=True, args=['run_hello_world_test'])
     with Step('build_all ' + arch, status):
       SCons(context, parallel=True, args=flags_build)
-    if arch == 'x86-32':
+    if arch in ('x86-32', 'x86-64'):
       with Step('build_all subzero ' + arch, status):
         SCons(context, parallel=True, args=flags_build + flags_subzero)
 
   smoke_tests = ['small_tests', 'medium_tests']
   # Normal pexe-mode tests
   with Step('smoke_tests ' + arch, status, halt_on_fail=False):
     SCons(context, parallel=True, args=flags_run + smoke_tests)
   # Large tests cannot be run in parallel
   with Step('large_tests ' + arch, status, halt_on_fail=False):
     SCons(context, parallel=False, args=flags_run + ['large_tests'])
   # Run small_tests, medium_tests, and large_tests with Subzero.
   # TODO(stichnot): Move this to the sandboxed translator section
   # along with the translate_fast flag once pnacl-sz.nexe is ready.
-  if arch == 'x86-32':
+  if arch in ('x86-32', 'x86-64'):
     # Normal pexe-mode tests
     with Step('smoke_tests subzero ' + arch, status, halt_on_fail=False):
       SCons(context, parallel=True,
             args=flags_run + flags_subzero + smoke_tests)
     # Large tests cannot be run in parallel
     with Step('large_tests subzero ' + arch, status, halt_on_fail=False):
       SCons(context, parallel=False,
             args=flags_run + flags_subzero + ['large_tests'])
 
   with Step('nonpexe_tests ' + arch, status, halt_on_fail=False):
@@ skipping 133 matching lines @@
     raise Exception('Unsupported platform')
 
   # Panda bots only have 2 cores.
   if pynacl.platform.GetArch() == 'arm':
     context['max_jobs'] = 2
 
   RunBuild(RunSconsTests, status)
 
 if __name__ == '__main__':
   Main()