Chromium Code Reviews| 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 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3275 'tests/ppapi_gles_book/nacl.scons', | 3276 'tests/ppapi_gles_book/nacl.scons', |
| 3276 'tests/ppapi_messaging/nacl.scons', | 3277 'tests/ppapi_messaging/nacl.scons', |
| 3277 # Broken by Chrome change | 3278 # Broken by Chrome change |
| 3278 # http://code.google.com/p/nativeclient/issues/detail?id=2480 | 3279 # http://code.google.com/p/nativeclient/issues/detail?id=2480 |
| 3279 #'tests/ppapi_simple_tests/nacl.scons', | 3280 #'tests/ppapi_simple_tests/nacl.scons', |
| 3280 'tests/ppapi_test_example/nacl.scons', | 3281 'tests/ppapi_test_example/nacl.scons', |
| 3281 'tests/ppapi_test_lib/nacl.scons', | 3282 'tests/ppapi_test_lib/nacl.scons', |
| 3282 'tests/ppapi_tests/nacl.scons', | 3283 'tests/ppapi_tests/nacl.scons', |
| 3283 'tests/pyauto_nacl/nacl.scons', | 3284 'tests/pyauto_nacl/nacl.scons', |
| 3284 'tests/unittests/shared/imc/nacl.scons', | 3285 'tests/unittests/shared/imc/nacl.scons', |
| 3286 'tests/untrusted_crash_dump/nacl.scons', | |
|
Mark Seaborn
2012/02/13 19:04:08
I noticed your change "taking out of irt tests".
bradn
2012/02/13 23:42:03
Had some trouble or other with the build, left in
| |
| 3285 'tests/unittests/shared/srpc/nacl.scons', | 3287 'tests/unittests/shared/srpc/nacl.scons', |
| 3286 'tests/windows_crash_in_syscall/nacl.scons', | 3288 'tests/windows_crash_in_syscall/nacl.scons', |
| 3287 #### ALPHABETICALLY SORTED #### | 3289 #### ALPHABETICALLY SORTED #### |
| 3288 ] | 3290 ] |
| 3289 | 3291 |
| 3290 if (not nacl_env.Bit('cros_chroot')) or CrosChrootHasGclient(): | 3292 if (not nacl_env.Bit('cros_chroot')) or CrosChrootHasGclient(): |
| 3291 # BUG=http://code.google.com/p/nativeclient/issues/detail?id=2455 | 3293 # BUG=http://code.google.com/p/nativeclient/issues/detail?id=2455 |
| 3292 # BUG=http://code.google.com/p/nativeclient/issues/detail?id=135 | 3294 # BUG=http://code.google.com/p/nativeclient/issues/detail?id=135 |
| 3293 # Do not load up these nacl.scons files in CrOS chroot, as they | 3295 # Do not load up these nacl.scons files in CrOS chroot, as they |
| 3294 # inject dependecies outside of the native_client source tree | 3296 # inject dependecies outside of the native_client source tree |
| (...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3760 nacl_env.ValidateSdk() | 3762 nacl_env.ValidateSdk() |
| 3761 | 3763 |
| 3762 if BROKEN_TEST_COUNT > 0: | 3764 if BROKEN_TEST_COUNT > 0: |
| 3763 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 3765 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
| 3764 if GetOption('brief_comstr'): | 3766 if GetOption('brief_comstr'): |
| 3765 msg += " Add --verbose to the command line for more information." | 3767 msg += " Add --verbose to the command line for more information." |
| 3766 print msg | 3768 print msg |
| 3767 | 3769 |
| 3768 # separate warnings from actual build output | 3770 # separate warnings from actual build output |
| 3769 Banner('B U I L D - O U T P U T:') | 3771 Banner('B U I L D - O U T P U T:') |
| OLD | NEW |