OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 # dump until we find out what is causing it. | 75 # dump until we find out what is causing it. |
76 tests_to_disable.extend([ | 76 tests_to_disable.extend([ |
77 'run_inbrowser_trusted_crash_in_startup_test', | 77 'run_inbrowser_trusted_crash_in_startup_test', |
78 'run_inbrowser_crash_in_syscall_test', | 78 'run_inbrowser_crash_in_syscall_test', |
79 'run_inbrowser_untrusted_crash_test', | 79 'run_inbrowser_untrusted_crash_test', |
80 ]) | 80 ]) |
81 | 81 |
82 if sys.platform in ('win32', 'cygwin'): | 82 if sys.platform in ('win32', 'cygwin'): |
83 tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') | 83 tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') |
84 | 84 |
85 # Webkit seems to be slightly buggy and breaking this test. Disabled so | |
86 # Webkit's DEPS can be rolled. | |
87 # See: http://crbug.com/143973 | |
88 # TODO(ncbray) re-enable. | |
89 tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') | |
90 | |
91 script_dir = os.path.dirname(os.path.abspath(__file__)) | 85 script_dir = os.path.dirname(os.path.abspath(__file__)) |
92 test_dir = os.path.dirname(script_dir) | 86 test_dir = os.path.dirname(script_dir) |
93 chrome_dir = os.path.dirname(test_dir) | 87 chrome_dir = os.path.dirname(test_dir) |
94 src_dir = os.path.dirname(chrome_dir) | 88 src_dir = os.path.dirname(chrome_dir) |
95 nacl_integration_script = os.path.join( | 89 nacl_integration_script = os.path.join( |
96 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') | 90 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') |
97 cmd = [sys.executable, | 91 cmd = [sys.executable, |
98 '/b/build/scripts/slave/runtest.py', | 92 '/b/build/scripts/slave/runtest.py', |
99 '--run-python-script', | 93 '--run-python-script', |
100 '--target=', | 94 '--target=', |
101 '--build-dir=', | 95 '--build-dir=', |
102 '--', | 96 '--', |
103 nacl_integration_script, | 97 nacl_integration_script, |
104 # TODO(ncbray) re-enable. | 98 # TODO(ncbray) re-enable. |
105 # https://code.google.com/p/chromium/issues/detail?id=133568 | 99 # https://code.google.com/p/chromium/issues/detail?id=133568 |
106 '--disable_glibc', | 100 '--disable_glibc', |
107 '--disable_tests=%s' % ','.join(tests_to_disable)] | 101 '--disable_tests=%s' % ','.join(tests_to_disable)] |
108 cmd += args | 102 cmd += args |
109 sys.stdout.write('Running %s\n' % ' '.join(cmd)) | 103 sys.stdout.write('Running %s\n' % ' '.join(cmd)) |
110 sys.stdout.flush() | 104 sys.stdout.flush() |
111 return subprocess.call(cmd) | 105 return subprocess.call(cmd) |
112 | 106 |
113 | 107 |
114 if __name__ == '__main__': | 108 if __name__ == '__main__': |
115 sys.exit(Main(sys.argv[1:])) | 109 sys.exit(Main(sys.argv[1:])) |
OLD | NEW |