Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Generates test runner factory and tests for GTests.""" | 5 """Generates test runner factory and tests for GTests.""" |
| 6 # pylint: disable=W0212 | 6 # pylint: disable=W0212 |
| 7 | 7 |
| 8 import fnmatch | 8 import fnmatch |
| 9 import glob | 9 import glob |
| 10 import logging | 10 import logging |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 # This needs to be kept in sync with the cmd line options for isolate.py | 124 # This needs to be kept in sync with the cmd line options for isolate.py |
| 125 # in src/build/isolate.gypi. | 125 # in src/build/isolate.gypi. |
| 126 isolate_cmd = [ | 126 isolate_cmd = [ |
| 127 'python', _ISOLATE_SCRIPT, | 127 'python', _ISOLATE_SCRIPT, |
| 128 'remap', | 128 'remap', |
| 129 '--isolate', isolate_abs_path, | 129 '--isolate', isolate_abs_path, |
| 130 '--isolated', isolated_abs_path, | 130 '--isolated', isolated_abs_path, |
| 131 '--outdir', constants.ISOLATE_DEPS_DIR, | 131 '--outdir', constants.ISOLATE_DEPS_DIR, |
| 132 | 132 |
| 133 '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(), | 133 '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(), |
| 134 '--path-variable', 'DEPTH', constants.DIR_SOURCE_ROOT, | |
|
M-A Ruel
2014/06/11 18:21:22
please reverse the order so they are sorted.
kjellander_chromium
2014/06/11 18:33:30
Done.
| |
| 134 | 135 |
| 135 '--config-variable', 'OS', 'android', | 136 '--config-variable', 'OS', 'android', |
| 136 '--config-variable', 'chromeos', '0', | 137 '--config-variable', 'chromeos', '0', |
| 137 '--config-variable', 'component', 'static_library', | 138 '--config-variable', 'component', 'static_library', |
| 138 '--config-variable', 'icu_use_data_file_flag', '1', | 139 '--config-variable', 'icu_use_data_file_flag', '1', |
| 139 '--config-variable', 'use_openssl', '0', | 140 '--config-variable', 'use_openssl', '0', |
| 140 ] | 141 ] |
| 141 assert not cmd_helper.RunCmd(isolate_cmd) | 142 assert not cmd_helper.RunCmd(isolate_cmd) |
| 142 | 143 |
| 143 # We're relying on the fact that timestamps are preserved | 144 # We're relying on the fact that timestamps are preserved |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 342 if test_options.gtest_filter: | 343 if test_options.gtest_filter: |
| 343 tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter) | 344 tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter) |
| 344 | 345 |
| 345 # Coalesce unit tests into a single test per device | 346 # Coalesce unit tests into a single test per device |
| 346 if test_options.suite_name != 'content_browsertests': | 347 if test_options.suite_name != 'content_browsertests': |
| 347 num_devices = len(devices) | 348 num_devices = len(devices) |
| 348 tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)] | 349 tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)] |
| 349 tests = [t for t in tests if t] | 350 tests = [t for t in tests if t] |
| 350 | 351 |
| 351 return (TestRunnerFactory, tests) | 352 return (TestRunnerFactory, tests) |
| OLD | NEW |