| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2011 The Chromium 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 os | 6 import os |
| 7 import subprocess | 7 import subprocess |
| 8 import sys | 8 import sys |
| 9 | 9 |
| 10 | 10 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 'run_fault_pm_nameservice_chrome_browser_test', | 56 'run_fault_pm_nameservice_chrome_browser_test', |
| 57 'run_fault_pq_os_pm_nameservice_chrome_browser_test', | 57 'run_fault_pq_os_pm_nameservice_chrome_browser_test', |
| 58 'run_fault_pq_dep_pm_nameservice_chrome_browser_test', | 58 'run_fault_pq_dep_pm_nameservice_chrome_browser_test', |
| 59 ]) | 59 ]) |
| 60 | 60 |
| 61 # TODO(mcgrathr): Reenable when resolved. | 61 # TODO(mcgrathr): Reenable when resolved. |
| 62 # Was seen to fail repeatedly on Windows. | 62 # Was seen to fail repeatedly on Windows. |
| 63 # http://code.google.com/p/nativeclient/issues/detail?id=2173 | 63 # http://code.google.com/p/nativeclient/issues/detail?id=2173 |
| 64 tests_to_disable.append('run_inbrowser_crash_in_syscall_test') | 64 tests_to_disable.append('run_inbrowser_crash_in_syscall_test') |
| 65 | 65 |
| 66 if sys.platform == 'darwin': | |
| 67 # The following test fails on debug builds of Chromium. | |
| 68 # See http://code.google.com/p/nativeclient/issues/detail?id=2077 | |
| 69 # TODO(mseaborn): Remove this when the issue is resolved. | |
| 70 tests_to_disable.append('run_ppapi_example_font_test') | |
| 71 | |
| 72 script_dir = os.path.dirname(os.path.abspath(__file__)) | 66 script_dir = os.path.dirname(os.path.abspath(__file__)) |
| 73 test_dir = os.path.dirname(script_dir) | 67 test_dir = os.path.dirname(script_dir) |
| 74 chrome_dir = os.path.dirname(test_dir) | 68 chrome_dir = os.path.dirname(test_dir) |
| 75 src_dir = os.path.dirname(chrome_dir) | 69 src_dir = os.path.dirname(chrome_dir) |
| 76 nacl_integration_script = os.path.join( | 70 nacl_integration_script = os.path.join( |
| 77 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') | 71 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') |
| 78 cmd = [sys.executable, | 72 cmd = [sys.executable, |
| 79 nacl_integration_script, | 73 nacl_integration_script, |
| 80 '--disable_tests=%s' % ','.join(tests_to_disable)] + args | 74 '--disable_tests=%s' % ','.join(tests_to_disable)] + args |
| 81 sys.stdout.write('Running %s\n' % ' '.join(cmd)) | 75 sys.stdout.write('Running %s\n' % ' '.join(cmd)) |
| 82 sys.stdout.flush() | 76 sys.stdout.flush() |
| 83 return subprocess.call(cmd) | 77 return subprocess.call(cmd) |
| 84 | 78 |
| 85 | 79 |
| 86 if __name__ == '__main__': | 80 if __name__ == '__main__': |
| 87 sys.exit(Main(sys.argv[1:])) | 81 sys.exit(Main(sys.argv[1:])) |
| OLD | NEW |