| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env 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 |
| 11 def Main(args): | 11 def Main(args): |
| 12 pwd = os.environ.get('PWD', '') | 12 pwd = os.environ.get('PWD', '') |
| 13 is_integration_bot = 'nacl-chrome' in pwd | 13 is_integration_bot = 'nacl-chrome' in pwd |
| 14 | 14 |
| 15 if not is_integration_bot and sys.platform == 'darwin': |
| 16 # TODO: Reenable. |
| 17 sys.stdout.write('Skipping nacl_integration, see http://crbug.com/105406\n') |
| 18 return |
| 19 |
| 15 # On the main Chrome waterfall, we may need to control where the tests are | 20 # On the main Chrome waterfall, we may need to control where the tests are |
| 16 # run. | 21 # run. |
| 17 # If there is serious skew in the PPAPI interface that causes all of | 22 # If there is serious skew in the PPAPI interface that causes all of |
| 18 # the NaCl integration tests to fail, you can uncomment the | 23 # the NaCl integration tests to fail, you can uncomment the |
| 19 # following block. (Make sure you comment it out when the issues | 24 # following block. (Make sure you comment it out when the issues |
| 20 # are resolved.) *However*, it is much preferred to add tests to | 25 # are resolved.) *However*, it is much preferred to add tests to |
| 21 # the 'tests_to_disable' list below. | 26 # the 'tests_to_disable' list below. |
| 22 #if not is_integration_bot: | 27 #if not is_integration_bot: |
| 23 # return | 28 # return |
| 24 | 29 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 cmd = [sys.executable, | 80 cmd = [sys.executable, |
| 76 nacl_integration_script, | 81 nacl_integration_script, |
| 77 '--disable_tests=%s' % ','.join(tests_to_disable)] + args | 82 '--disable_tests=%s' % ','.join(tests_to_disable)] + args |
| 78 sys.stdout.write('Running %s\n' % ' '.join(cmd)) | 83 sys.stdout.write('Running %s\n' % ' '.join(cmd)) |
| 79 sys.stdout.flush() | 84 sys.stdout.flush() |
| 80 return subprocess.call(cmd) | 85 return subprocess.call(cmd) |
| 81 | 86 |
| 82 | 87 |
| 83 if __name__ == '__main__': | 88 if __name__ == '__main__': |
| 84 sys.exit(Main(sys.argv[1:])) | 89 sys.exit(Main(sys.argv[1:])) |
| OLD | NEW |