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

buildbot/buildbot_pnacl.py

Index: buildbot/buildbot_pnacl.py
diff --git a/buildbot/buildbot_pnacl.py b/buildbot/buildbot_pnacl.py
index d950ed2b15ab1965e8de2f799d8c3b3284324bdb..48aa32bf6ad86c25f647563fc605e6bd27992155 100755
--- a/buildbot/buildbot_pnacl.py
+++ b/buildbot/buildbot_pnacl.py
@@ -26,6 +26,7 @@ def RunSconsTests(status, context):
 
   arch = context['default_scons_platform']
 
+  flags_subzero = ['use_sz=1']
   flags_build = ['do_not_run_tests=1']
   flags_run = []
 
@@ -59,6 +60,9 @@ def RunSconsTests(status, context):
           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':

[JF, 2015/03/29 05:46:09]

Is this the duplication dschuff was mentioning? Leave a TODO to remove it?

[Jim Stichnoth, 2015/03/30 20:36:53]

I think the duplication was in a different set of tests...

The trybot says that about 11 minutes is spent on the original build_all step,
followed by about 3 minutes on this build_all subzero step, so I don't think
there's duplication here (i.e., the pexes are being reused).

[Derek Schuff, 2015/03/30 21:11:15]

I don't see how that's possible when the scons-out directory is totally separate
(see e.g.
scons-out/nacl-x86-32-pnacl-subzero-pexe-clang/obj/tests/hello_world/hello_world.final.pexe
vs
scons-out/nacl-x86-32-pnacl-pexe-clang/obj/tests/hello_world/hello_world.final.pexe).
3 vs 11 mins seems like more than you would expect for just faster translation
too... maybe there are more (or slower) tests than we would expect that require
non-finalized pexes?

+      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
@@ -67,6 +71,18 @@ def RunSconsTests(status, context):
   # 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.

[jvoung (off chromium), 2015/03/30 17:56:15]

pnacl-sz.nexe should work now too, but could toggle that separately

[Jim Stichnoth, 2015/03/30 20:36:53]

OK.  I think I'd like to deal with pnacl-sz.nexe in a separate CL.  (for this
and the other relevant tests)

+  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,