| 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 """A tool to run a chrome test executable directly, or in isolated mode. | 6 """A tool to run a chrome test executable directly, or in isolated mode. |
| 7 | 7 |
| 8 TODO(maruel): This script technically needs to die and be replaced by running | 8 TODO(maruel): This script technically needs to die and be replaced by running |
| 9 all the tests always isolated even when not run on Swarming. This will take a | 9 all the tests always isolated even when not run on Swarming. This will take a |
| 10 while. | 10 while. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 MAC_ISOLATE_ENABLED_TESTS = set() | 33 MAC_ISOLATE_ENABLED_TESTS = set() |
| 34 | 34 |
| 35 WIN_ISOLATE_ENABLED_TESTS = set(( | 35 WIN_ISOLATE_ENABLED_TESTS = set(( |
| 36 'base_unittests', | 36 'base_unittests', |
| 37 'browser_tests', | 37 'browser_tests', |
| 38 'interactive_ui_tests', | 38 'interactive_ui_tests', |
| 39 'net_unittests', | 39 'net_unittests', |
| 40 'unit_tests', | 40 'unit_tests', |
| 41 )) | 41 )) |
| 42 | 42 |
| 43 # http://crbug.com/260311 | |
| 44 # They are missing files for an unknown reason. | |
| 45 BUG_260311 = set(( | |
| 46 'browser_tests', | |
| 47 'interactive_ui_tests', | |
| 48 )) | |
| 49 | |
| 50 ISOLATE_ENABLED_BUILDERS = { | 43 ISOLATE_ENABLED_BUILDERS = { |
| 51 # CI linux | 44 # CI linux |
| 52 'Linux Tests': LINUX_ISOLATE_ENABLED_TESTS, | 45 'Linux Tests': LINUX_ISOLATE_ENABLED_TESTS, |
| 53 # CI mac | 46 # CI mac |
| 54 'Mac10.6 Tests (1)': MAC_ISOLATE_ENABLED_TESTS, | 47 'Mac10.6 Tests (1)': MAC_ISOLATE_ENABLED_TESTS, |
| 55 'Mac10.7 Tests (1)': MAC_ISOLATE_ENABLED_TESTS, | 48 'Mac10.7 Tests (1)': MAC_ISOLATE_ENABLED_TESTS, |
| 56 # CI win | 49 # CI win |
| 57 'Vista Tests (1)': WIN_ISOLATE_ENABLED_TESTS - BUG_260311, | |
| 58 'Vista Tests (2)': WIN_ISOLATE_ENABLED_TESTS - BUG_260311, | |
| 59 'Vista Tests (3)': WIN_ISOLATE_ENABLED_TESTS - BUG_260311, | |
| 60 'Win7 Tests (1)': WIN_ISOLATE_ENABLED_TESTS, | 50 'Win7 Tests (1)': WIN_ISOLATE_ENABLED_TESTS, |
| 61 'Win7 Tests (2)': WIN_ISOLATE_ENABLED_TESTS, | 51 'Win10 Tests x64': WIN_ISOLATE_ENABLED_TESTS, |
| 62 'Win7 Tests (3)': WIN_ISOLATE_ENABLED_TESTS, | |
| 63 'XP Tests (1)': WIN_ISOLATE_ENABLED_TESTS - BUG_260311, | |
| 64 'XP Tests (2)': WIN_ISOLATE_ENABLED_TESTS - BUG_260311, | |
| 65 'XP Tests (3)': WIN_ISOLATE_ENABLED_TESTS - BUG_260311, | |
| 66 | 52 |
| 67 # Try Server | 53 # Try Server |
| 68 'linux_rel': LINUX_ISOLATE_ENABLED_TESTS, | 54 'linux_rel': LINUX_ISOLATE_ENABLED_TESTS, |
| 69 'mac_rel': MAC_ISOLATE_ENABLED_TESTS, | 55 'mac_rel': MAC_ISOLATE_ENABLED_TESTS, |
| 70 'win_rel': WIN_ISOLATE_ENABLED_TESTS, | 56 'win_rel': WIN_ISOLATE_ENABLED_TESTS, |
| 71 } | 57 } |
| 72 | 58 |
| 73 | 59 |
| 74 def should_run_as_isolated(builder_name, test_name): | 60 def should_run_as_isolated(builder_name, test_name): |
| 75 logging.info('should_run_as_isolated(%s, %s)' % (builder_name, test_name)) | 61 logging.info('should_run_as_isolated(%s, %s)' % (builder_name, test_name)) |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 'swarming_client', 'isolate.py') | 146 'swarming_client', 'isolate.py') |
| 161 | 147 |
| 162 return run_test_isolated(isolate_script, test_exe, original_command) | 148 return run_test_isolated(isolate_script, test_exe, original_command) |
| 163 else: | 149 else: |
| 164 logging.info('Running test normally') | 150 logging.info('Running test normally') |
| 165 return run_command(original_command) | 151 return run_command(original_command) |
| 166 | 152 |
| 167 | 153 |
| 168 if '__main__' == __name__: | 154 if '__main__' == __name__: |
| 169 sys.exit(main(None)) | 155 sys.exit(main(None)) |
| OLD | NEW |