Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright 2014 The Native Client Authors. All rights reserved. | 2 # Copyright 2014 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 Import('env') | 6 Import('env') |
| 7 | 7 |
| 8 | 8 |
| 9 # Disable this on Valgrind because we don't particularly need to measure | 9 # Disable this on Valgrind because we don't particularly need to measure |
| 10 # performance under Valgrind. Also, disable on emulation, since these | 10 # performance under Valgrind. Also, disable on emulation, since these |
| 11 # are benchmarks and need to run on real hardware. | 11 # are benchmarks and need to run on real hardware. |
| 12 is_broken = env.Bit('running_on_valgrind') or env.UsingEmulator() | 12 is_broken = env.Bit('running_on_valgrind') or env.UsingEmulator() |
| 13 | 13 |
| 14 # Disable for Subzero. (Alternatively, increase the timeout if possible.) | |
| 15 # https://code.google.com/p/nativeclient/issues/detail?id=4136 | |
| 16 is_broken = is_broken or env.Bit('use_sz') | |
|
Jim Stichnoth
2015/03/29 03:12:56
Would be nice if we could bump the timeout for thi
jvoung (off chromium)
2015/03/30 17:56:15
Could also set "size=huge" (for this case).
size=
Jim Stichnoth
2015/03/30 20:36:53
Managed to find a way to bump the timeout for this
| |
| 17 | |
| 14 libs = [] | 18 libs = [] |
| 15 if env.Bit('nacl_glibc'): | 19 if env.Bit('nacl_glibc'): |
| 16 # Needed for clock_gettime(). | 20 # Needed for clock_gettime(). |
| 17 libs.append('rt') | 21 libs.append('rt') |
| 18 | 22 |
| 19 env.Append(CFLAGS=['-std=c99', '-O2']) | 23 env.Append(CFLAGS=['-std=c99', '-O2']) |
| 20 env.Append(CCFLAGS=['-O2']) | 24 env.Append(CCFLAGS=['-O2']) |
| 21 env.Prepend(CPPPATH=['${MAIN_DIR}/src']) | 25 env.Prepend(CPPPATH=['${MAIN_DIR}/src']) |
| 22 | 26 |
| 23 nexe = env.ComponentProgram( | 27 nexe = env.ComponentProgram( |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 35 if 'TRUSTED_ENV' not in env: | 39 if 'TRUSTED_ENV' not in env: |
| 36 Return() | 40 Return() |
| 37 | 41 |
| 38 node = env.CommandSelLdrTestNacl( | 42 node = env.CommandSelLdrTestNacl( |
| 39 'benchmark_test.out', nexe, [env.GetPerfEnvDescription()], | 43 'benchmark_test.out', nexe, [env.GetPerfEnvDescription()], |
| 40 # Don't hide output: We want the timings to be reported in the | 44 # Don't hide output: We want the timings to be reported in the |
| 41 # Buildbot logs so that Buildbot records the "RESULT" lines. | 45 # Buildbot logs so that Buildbot records the "RESULT" lines. |
| 42 capture_output=False) | 46 capture_output=False) |
| 43 env.AddNodeToTestSuite(node, ['large_tests'], 'run_benchmark_test', | 47 env.AddNodeToTestSuite(node, ['large_tests'], 'run_benchmark_test', |
| 44 is_broken=is_broken) | 48 is_broken=is_broken) |
| OLD | NEW |