Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: build/android/pylib/gtest/setup.py

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/i18n/icu_util.cc ('k') | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 'remap', 116 'remap',
117 '--isolate', isolate_abs_path, 117 '--isolate', isolate_abs_path,
118 '--isolated', isolated_abs_path, 118 '--isolated', isolated_abs_path,
119 '--outdir', constants.ISOLATE_DEPS_DIR, 119 '--outdir', constants.ISOLATE_DEPS_DIR,
120 120
121 '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(), 121 '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(),
122 122
123 '--config-variable', 'OS', 'android', 123 '--config-variable', 'OS', 'android',
124 '--config-variable', 'chromeos', '0', 124 '--config-variable', 'chromeos', '0',
125 '--config-variable', 'component', 'static_library', 125 '--config-variable', 'component', 'static_library',
126 '--config-variable', 'icu_use_data_file_flag', '0', 126 '--config-variable', 'icu_use_data_file_flag', '1',
127 '--config-variable', 'use_openssl', '0', 127 '--config-variable', 'use_openssl', '0',
128 ] 128 ]
129 assert not cmd_helper.RunCmd(isolate_cmd) 129 assert not cmd_helper.RunCmd(isolate_cmd)
130 130
131 # We're relying on the fact that timestamps are preserved 131 # We're relying on the fact that timestamps are preserved
132 # by the remap command (hardlinked). Otherwise, all the data 132 # by the remap command (hardlinked). Otherwise, all the data
133 # will be pushed to the device once we move to using time diff 133 # will be pushed to the device once we move to using time diff
134 # instead of md5sum. Perform a sanity check here. 134 # instead of md5sum. Perform a sanity check here.
135 for root, _, filenames in os.walk(constants.ISOLATE_DEPS_DIR): 135 for root, _, filenames in os.walk(constants.ISOLATE_DEPS_DIR):
136 if filenames: 136 if filenames:
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 if test_options.gtest_filter: 316 if test_options.gtest_filter:
317 tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter) 317 tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
318 318
319 # Coalesce unit tests into a single test per device 319 # Coalesce unit tests into a single test per device
320 if test_options.suite_name != 'content_browsertests': 320 if test_options.suite_name != 'content_browsertests':
321 num_devices = len(devices) 321 num_devices = len(devices)
322 tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)] 322 tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
323 tests = [t for t in tests if t] 323 tests = [t for t in tests if t]
324 324
325 return (TestRunnerFactory, tests) 325 return (TestRunnerFactory, tests)
OLDNEW
« no previous file with comments | « base/i18n/icu_util.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698