| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 # because of a kernel bug that we might need to work around. | 66 # because of a kernel bug that we might need to work around. |
| 67 # See http://code.google.com/p/nativeclient/issues/detail?id=1835 | 67 # See http://code.google.com/p/nativeclient/issues/detail?id=1835 |
| 68 # TODO(mseaborn): Remove this when the issue is resolved. | 68 # TODO(mseaborn): Remove this when the issue is resolved. |
| 69 tests_to_disable.append('run_async_messaging_test') | 69 tests_to_disable.append('run_async_messaging_test') |
| 70 # The following test fails on debug builds of Chromium. | 70 # The following test fails on debug builds of Chromium. |
| 71 # See http://code.google.com/p/nativeclient/issues/detail?id=2077 | 71 # See http://code.google.com/p/nativeclient/issues/detail?id=2077 |
| 72 # TODO(mseaborn): Remove this when the issue is resolved. | 72 # TODO(mseaborn): Remove this when the issue is resolved. |
| 73 tests_to_disable.append('run_ppapi_example_font_test') | 73 tests_to_disable.append('run_ppapi_example_font_test') |
| 74 | 74 |
| 75 script_dir = os.path.dirname(os.path.abspath(__file__)) | 75 script_dir = os.path.dirname(os.path.abspath(__file__)) |
| 76 test_dir = os.path.dirname(script_dir) | 76 chrome_dir = os.path.dirname(script_dir) |
| 77 chrome_dir = os.path.dirname(test_dir) | |
| 78 src_dir = os.path.dirname(chrome_dir) | 77 src_dir = os.path.dirname(chrome_dir) |
| 79 nacl_integration_script = os.path.join( | 78 nacl_integration_script = os.path.join( |
| 80 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') | 79 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') |
| 81 cmd = [sys.executable, | 80 cmd = [sys.executable, |
| 82 nacl_integration_script, | 81 nacl_integration_script, |
| 83 '--disable_tests=%s' % ','.join(tests_to_disable)] + args | 82 '--disable_tests=%s' % ','.join(tests_to_disable)] + args |
| 84 sys.stdout.write('Running %s\n' % ' '.join(cmd)) | 83 sys.stdout.write('Running %s\n' % ' '.join(cmd)) |
| 85 sys.stdout.flush() | 84 sys.stdout.flush() |
| 86 return subprocess.call(cmd) | 85 return subprocess.call(cmd) |
| 87 | 86 |
| 88 | 87 |
| 89 if __name__ == '__main__': | 88 if __name__ == '__main__': |
| 90 sys.exit(Main(sys.argv[1:])) | 89 sys.exit(Main(sys.argv[1:])) |
| OLD | NEW |