Add Subzero to scons tests on the bots. x86-32 only.

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,
     RemoveSconsBuildDirectories, RunBuild, SetupLinuxEnvironment,
     SetupMacEnvironment, SetupWindowsEnvironment, SCons, Step )
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import pynacl.platform
 
 def RunSconsTests(status, context):
   # Clean out build directories, unless we have built elsewhere.
   if not context['skip_build']:
     with Step('clobber scons', status):
       RemoveSconsBuildDirectories()
 
   # Run checkdeps script to vet #includes.
   with Step('checkdeps', status):
     Command(context, cmd=[sys.executable, 'tools/checkdeps/checkdeps.py'])
 
   arch = context['default_scons_platform']
 
+  flags_subzero = ['use_sz=1']
   flags_build = ['do_not_run_tests=1']
   flags_run = []
 
   # This file is run 3 different ways for ARM builds. The qemu-only trybot does
   # a normal build-and-run with the emulator just like the x86 bots. The panda
   # build side runs on an x86 machines with skip_run, and then packs up the
   # result and triggers an ARM hardware tester that run with skip_build
   if arch != 'arm':
     # Unlike their arm counterparts we do not run trusted tests on x86 bots.
     # Trusted tests get plenty of coverage by other bots, e.g. nacl-gcc bots.
@@ skipping 13 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':
+      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':
+    # 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):
     SCons(context, parallel=True,
           args=flags_run + ['pnacl_generate_pexe=0', 'nonpexe_tests'])
 
   irt_mode = context['default_scons_mode'] + ['nacl_irt_test']
   # Build all the tests with the IRT
   if not context['skip_build']:
     with Step('build_all_irt ' + arch, status):
       SCons(context, parallel=True, mode=irt_mode, args=flags_build)
@@ skipping 129 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()