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

tests/benchmark/nacl.scons

Index: tests/benchmark/nacl.scons
diff --git a/tests/benchmark/nacl.scons b/tests/benchmark/nacl.scons
index cc1caf5978fe9996cae7477435761fa8dbe4968a..eae051f7142f175ec7cc20c41e1b9a1a6a8b58e9 100644
--- a/tests/benchmark/nacl.scons
+++ b/tests/benchmark/nacl.scons
@@ -11,6 +11,10 @@ Import('env')
 # are benchmarks and need to run on real hardware.
 is_broken = env.Bit('running_on_valgrind') or env.UsingEmulator()
 
+# Increase the test timeout for Subzero.
+# https://code.google.com/p/nativeclient/issues/detail?id=4136
+timeout_override = 200 if env.Bit('use_sz') else 0
+
 libs = []
 if env.Bit('nacl_glibc'):
   # Needed for clock_gettime().
@@ -37,6 +41,7 @@ if 'TRUSTED_ENV' not in env:
 
 node = env.CommandSelLdrTestNacl(
     'benchmark_test.out', nexe, [env.GetPerfEnvDescription()],
+    time_error=timeout_override,
     # Don't hide output: We want the timings to be reported in the
     # Buildbot logs so that Buildbot records the "RESULT" lines.
     capture_output=False)