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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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', 'DEPTH', constants.DIR_SOURCE_ROOT, | 133 '--path-variable', 'DEPTH', constants.DIR_SOURCE_ROOT, |
134 '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(), | 134 '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(), |
135 | 135 |
136 '--config-variable', 'OS', 'android', | 136 '--config-variable', 'OS', 'android', |
| 137 '--config-variable', 'CONFIGURATION_NAME', constants.GetBuildType(), |
137 '--config-variable', 'chromeos', '0', | 138 '--config-variable', 'chromeos', '0', |
138 '--config-variable', 'component', 'static_library', | 139 '--config-variable', 'component', 'static_library', |
139 '--config-variable', 'icu_use_data_file_flag', '1', | 140 '--config-variable', 'icu_use_data_file_flag', '1', |
140 '--config-variable', 'use_openssl', '0', | 141 '--config-variable', 'use_openssl', '0', |
141 ] | 142 ] |
142 assert not cmd_helper.RunCmd(isolate_cmd) | 143 assert not cmd_helper.RunCmd(isolate_cmd) |
143 | 144 |
144 # We're relying on the fact that timestamps are preserved | 145 # We're relying on the fact that timestamps are preserved |
145 # by the remap command (hardlinked). Otherwise, all the data | 146 # by the remap command (hardlinked). Otherwise, all the data |
146 # will be pushed to the device once we move to using time diff | 147 # will be pushed to the device once we move to using time diff |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 if test_options.gtest_filter: | 377 if test_options.gtest_filter: |
377 tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter) | 378 tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter) |
378 | 379 |
379 # Coalesce unit tests into a single test per device | 380 # Coalesce unit tests into a single test per device |
380 if test_options.suite_name != 'content_browsertests': | 381 if test_options.suite_name != 'content_browsertests': |
381 num_devices = len(devices) | 382 num_devices = len(devices) |
382 tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)] | 383 tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)] |
383 tests = [t for t in tests if t] | 384 tests = [t for t in tests if t] |
384 | 385 |
385 return (TestRunnerFactory, tests) | 386 return (TestRunnerFactory, tests) |
OLD | NEW |