| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 'run_srpc_hw_chrome_browser_test', | 51 'run_srpc_hw_chrome_browser_test', |
| 52 'run_srpc_manifest_file_chrome_browser_test', | 52 'run_srpc_manifest_file_chrome_browser_test', |
| 53 'run_srpc_nameservice_chrome_browser_test', | 53 'run_srpc_nameservice_chrome_browser_test', |
| 54 'run_srpc_nrd_xfer_chrome_browser_test', | 54 'run_srpc_nrd_xfer_chrome_browser_test', |
| 55 'run_no_fault_pm_nameservice_chrome_browser_test', | 55 'run_no_fault_pm_nameservice_chrome_browser_test', |
| 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 if sys.platform == 'darwin': |
| 62 # TODO(mseaborn) fix |
| 63 # http://code.google.com/p/nativeclient/issues/detail?id=1835 |
| 64 tests_to_disable.append('run_ppapi_crash_browser_test') |
| 65 |
| 61 if sys.platform in ('win32', 'cygwin'): | 66 if sys.platform in ('win32', 'cygwin'): |
| 62 tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') | 67 tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') |
| 63 | 68 |
| 64 script_dir = os.path.dirname(os.path.abspath(__file__)) | 69 script_dir = os.path.dirname(os.path.abspath(__file__)) |
| 65 test_dir = os.path.dirname(script_dir) | 70 test_dir = os.path.dirname(script_dir) |
| 66 chrome_dir = os.path.dirname(test_dir) | 71 chrome_dir = os.path.dirname(test_dir) |
| 67 src_dir = os.path.dirname(chrome_dir) | 72 src_dir = os.path.dirname(chrome_dir) |
| 68 nacl_integration_script = os.path.join( | 73 nacl_integration_script = os.path.join( |
| 69 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') | 74 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') |
| 70 cmd = [sys.executable, | 75 cmd = [sys.executable, |
| 71 nacl_integration_script, | 76 nacl_integration_script, |
| 72 '--disable_tests=%s' % ','.join(tests_to_disable)] + args | 77 '--disable_tests=%s' % ','.join(tests_to_disable)] + args |
| 73 sys.stdout.write('Running %s\n' % ' '.join(cmd)) | 78 sys.stdout.write('Running %s\n' % ' '.join(cmd)) |
| 74 sys.stdout.flush() | 79 sys.stdout.flush() |
| 75 return subprocess.call(cmd) | 80 return subprocess.call(cmd) |
| 76 | 81 |
| 77 | 82 |
| 78 if __name__ == '__main__': | 83 if __name__ == '__main__': |
| 79 sys.exit(Main(sys.argv[1:])) | 84 sys.exit(Main(sys.argv[1:])) |
| OLD | NEW |