| OLD | NEW |
| 1 #! -*- python -*- | 1 #! -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 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 atexit | 6 import atexit |
| 7 import glob | 7 import glob |
| 8 import os | 8 import os |
| 9 import platform | 9 import platform |
| 10 import shutil | 10 import shutil |
| (...skipping 1587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1598 post_actions = [] | 1598 post_actions = [] |
| 1599 # Set a given file to be the nexe's stdout or stderr. The tester also | 1599 # Set a given file to be the nexe's stdout or stderr. The tester also |
| 1600 # compares this output against a golden file. | 1600 # compares this output against a golden file. |
| 1601 for stream, params in ( | 1601 for stream, params in ( |
| 1602 ('stdout', nacl_exe_stdout), | 1602 ('stdout', nacl_exe_stdout), |
| 1603 ('stderr', nacl_exe_stderr)): | 1603 ('stderr', nacl_exe_stderr)): |
| 1604 if params is None: | 1604 if params is None: |
| 1605 continue | 1605 continue |
| 1606 stream_file = env.subst(params['file']) | 1606 stream_file = env.subst(params['file']) |
| 1607 command.extend(['--nacl_exe_' + stream, stream_file]) | 1607 command.extend(['--nacl_exe_' + stream, stream_file]) |
| 1608 golden_file = env.subst(params['golden']) | 1608 if 'golden' in params: |
| 1609 filter_regex = params.get('filter_regex', None) | 1609 golden_file = env.subst(params['golden']) |
| 1610 filter_inverse = params.get('filter_inverse', False) | 1610 filter_regex = params.get('filter_regex', None) |
| 1611 filter_group_only = params.get('filter_group_only', False) | 1611 filter_inverse = params.get('filter_inverse', False) |
| 1612 post_actions.append( | 1612 filter_group_only = params.get('filter_group_only', False) |
| 1613 GoldenFileCheckAction( | 1613 post_actions.append( |
| 1614 env, stream_file, golden_file, | 1614 GoldenFileCheckAction( |
| 1615 filter_regex, filter_inverse, filter_group_only)) | 1615 env, stream_file, golden_file, |
| 1616 filter_regex, filter_inverse, filter_group_only)) |
| 1616 | 1617 |
| 1617 if ShouldUseVerboseOptions(extra): | 1618 if ShouldUseVerboseOptions(extra): |
| 1618 env.MakeVerboseExtraOptions(target, log_verbosity, extra) | 1619 env.MakeVerboseExtraOptions(target, log_verbosity, extra) |
| 1619 # Heuristic for when to capture output... | 1620 # Heuristic for when to capture output... |
| 1620 capture_output = (extra.pop('capture_output', False) | 1621 capture_output = (extra.pop('capture_output', False) |
| 1621 or 'process_output_single' in extra) | 1622 or 'process_output_single' in extra) |
| 1622 node = env.CommandTest(target, | 1623 node = env.CommandTest(target, |
| 1623 command, | 1624 command, |
| 1624 # Set to 'huge' so that the browser tester's timeout | 1625 # Set to 'huge' so that the browser tester's timeout |
| 1625 # takes precedence over the default of the test_suite. | 1626 # takes precedence over the default of the test_suite. |
| (...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3123 'src/shared/ppapi/nacl.scons', | 3124 'src/shared/ppapi/nacl.scons', |
| 3124 'src/shared/ppapi_proxy/nacl.scons', | 3125 'src/shared/ppapi_proxy/nacl.scons', |
| 3125 ]) | 3126 ]) |
| 3126 | 3127 |
| 3127 nacl_env.Append( | 3128 nacl_env.Append( |
| 3128 BUILD_SCONSCRIPTS = [ | 3129 BUILD_SCONSCRIPTS = [ |
| 3129 'src/shared/srpc/nacl.scons', | 3130 'src/shared/srpc/nacl.scons', |
| 3130 'src/trusted/service_runtime/nacl.scons', | 3131 'src/trusted/service_runtime/nacl.scons', |
| 3131 'src/trusted/validator_x86/nacl.scons', | 3132 'src/trusted/validator_x86/nacl.scons', |
| 3132 'src/trusted/weak_ref/nacl.scons', | 3133 'src/trusted/weak_ref/nacl.scons', |
| 3134 'src/untrusted/crash_dump/nacl.scons', |
| 3133 'src/untrusted/irt_stub/nacl.scons', | 3135 'src/untrusted/irt_stub/nacl.scons', |
| 3134 'src/untrusted/nacl/nacl.scons', | 3136 'src/untrusted/nacl/nacl.scons', |
| 3135 'src/untrusted/nacl_ppapi_util/nacl.scons', | 3137 'src/untrusted/nacl_ppapi_util/nacl.scons', |
| 3136 'src/untrusted/pnacl_irt_shim/nacl.scons', | 3138 'src/untrusted/pnacl_irt_shim/nacl.scons', |
| 3137 'src/untrusted/pnacl_support_extension/nacl.scons', | 3139 'src/untrusted/pnacl_support_extension/nacl.scons', |
| 3138 'src/untrusted/ppapi/nacl.scons', | 3140 'src/untrusted/ppapi/nacl.scons', |
| 3139 'src/untrusted/valgrind/nacl.scons', | 3141 'src/untrusted/valgrind/nacl.scons', |
| 3140 #### ALPHABETICALLY SORTED #### | 3142 #### ALPHABETICALLY SORTED #### |
| 3141 ]) | 3143 ]) |
| 3142 | 3144 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3212 'tests/sysbasic/nacl.scons', | 3214 'tests/sysbasic/nacl.scons', |
| 3213 'tests/syscall_return_sandboxing/nacl.scons', | 3215 'tests/syscall_return_sandboxing/nacl.scons', |
| 3214 'tests/syscalls/nacl.scons', | 3216 'tests/syscalls/nacl.scons', |
| 3215 'tests/threads/nacl.scons', | 3217 'tests/threads/nacl.scons', |
| 3216 'tests/time/nacl.scons', | 3218 'tests/time/nacl.scons', |
| 3217 'tests/tls/nacl.scons', | 3219 'tests/tls/nacl.scons', |
| 3218 'tests/tls_perf/nacl.scons', | 3220 'tests/tls_perf/nacl.scons', |
| 3219 'tests/toolchain/nacl.scons', | 3221 'tests/toolchain/nacl.scons', |
| 3220 'tests/unittests/shared/platform/nacl.scons', | 3222 'tests/unittests/shared/platform/nacl.scons', |
| 3221 'tests/untrusted_check/nacl.scons', | 3223 'tests/untrusted_check/nacl.scons', |
| 3224 'tests/untrusted_crash_dump/nacl.scons', |
| 3222 #### ALPHABETICALLY SORTED #### | 3225 #### ALPHABETICALLY SORTED #### |
| 3223 ] | 3226 ] |
| 3224 | 3227 |
| 3225 # These are tests that are not worthwhile to run in an IRT variant. | 3228 # These are tests that are not worthwhile to run in an IRT variant. |
| 3226 # In some cases, that's because they are browser tests which always | 3229 # In some cases, that's because they are browser tests which always |
| 3227 # use the IRT. In others, it's because they are special-case tests | 3230 # use the IRT. In others, it's because they are special-case tests |
| 3228 # that are incompatible with having an IRT loaded. | 3231 # that are incompatible with having an IRT loaded. |
| 3229 nonvariant_tests = [ | 3232 nonvariant_tests = [ |
| 3230 #### ALPHABETICALLY SORTED #### | 3233 #### ALPHABETICALLY SORTED #### |
| 3231 'tests/barebones/nacl.scons', | 3234 'tests/barebones/nacl.scons', |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3760 nacl_env.ValidateSdk() | 3763 nacl_env.ValidateSdk() |
| 3761 | 3764 |
| 3762 if BROKEN_TEST_COUNT > 0: | 3765 if BROKEN_TEST_COUNT > 0: |
| 3763 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 3766 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
| 3764 if GetOption('brief_comstr'): | 3767 if GetOption('brief_comstr'): |
| 3765 msg += " Add --verbose to the command line for more information." | 3768 msg += " Add --verbose to the command line for more information." |
| 3766 print msg | 3769 print msg |
| 3767 | 3770 |
| 3768 # separate warnings from actual build output | 3771 # separate warnings from actual build output |
| 3769 Banner('B U I L D - O U T P U T:') | 3772 Banner('B U I L D - O U T P U T:') |
| OLD | NEW |