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

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

Issue 1908253006: Revert of Generate Android .isolate files used for test()s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import logging 5 import logging
6 import os 6 import os
7 import re 7 import re
8 import tempfile 8 import tempfile
9 9
10 from devil.android import apk_helper 10 from devil.android import apk_helper
11 from pylib import constants 11 from pylib import constants
12 from pylib.constants import host_paths 12 from pylib.constants import host_paths
13 from pylib.base import base_test_result 13 from pylib.base import base_test_result
14 from pylib.base import test_instance 14 from pylib.base import test_instance
15 from pylib.utils import isolator
16 15
17 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH): 16 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
18 import unittest_util # pylint: disable=import-error 17 import unittest_util # pylint: disable=import-error
19 18
20 19
21 BROWSER_TEST_SUITES = [ 20 BROWSER_TEST_SUITES = [
22 'components_browsertests', 21 'components_browsertests',
23 'content_browsertests', 22 'content_browsertests',
24 ] 23 ]
25 24
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 self._gtest_filter = ':'.join(l.strip() for l in f) 190 self._gtest_filter = ':'.join(l.strip() for l in f)
192 else: 191 else:
193 self._gtest_filter = None 192 self._gtest_filter = None
194 193
195 if not args.isolate_file_path: 194 if not args.isolate_file_path:
196 default_isolate_file_path = _DEFAULT_ISOLATE_FILE_PATHS.get(self._suite) 195 default_isolate_file_path = _DEFAULT_ISOLATE_FILE_PATHS.get(self._suite)
197 if default_isolate_file_path: 196 if default_isolate_file_path:
198 args.isolate_file_path = os.path.join( 197 args.isolate_file_path = os.path.join(
199 host_paths.DIR_SOURCE_ROOT, default_isolate_file_path) 198 host_paths.DIR_SOURCE_ROOT, default_isolate_file_path)
200 199
201 if (args.isolate_file_path and 200 if args.isolate_file_path:
202 not isolator.IsIsolateEmpty(args.isolate_file_path)):
203 self._isolate_abs_path = os.path.abspath(args.isolate_file_path) 201 self._isolate_abs_path = os.path.abspath(args.isolate_file_path)
204 self._isolate_delegate = isolate_delegate 202 self._isolate_delegate = isolate_delegate
205 self._isolated_abs_path = os.path.join( 203 self._isolated_abs_path = os.path.join(
206 constants.GetOutDirectory(), '%s.isolated' % self._suite) 204 constants.GetOutDirectory(), '%s.isolated' % self._suite)
207 else: 205 else:
208 logging.warning('No isolate file provided. No data deps will be pushed.') 206 logging.warning('No isolate file provided. No data deps will be pushed.')
209 self._isolate_delegate = None 207 self._isolate_delegate = None
210 208
211 if args.app_data_files: 209 if args.app_data_files:
212 self._app_data_files = args.app_data_files 210 self._app_data_files = args.app_data_files
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 result_type = None 401 result_type = None
404 402
405 return results 403 return results
406 404
407 #override 405 #override
408 def TearDown(self): 406 def TearDown(self):
409 """Clear the mappings created by SetUp.""" 407 """Clear the mappings created by SetUp."""
410 if self._isolate_delegate: 408 if self._isolate_delegate:
411 self._isolate_delegate.Clear() 409 self._isolate_delegate.Clear()
412 410
OLDNEW
« no previous file with comments | « android_webview/test/BUILD.gn ('k') | build/android/pylib/instrumentation/instrumentation_test_instance.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698