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

Side by Side Diff: build/android/pylib/utils/isolator.py

Issue 895923002: Support MSan/TSan in test isolation and test_env.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix duplicate var Created 5 years, 10 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 fnmatch 5 import fnmatch
6 import glob 6 import glob
7 import os 7 import os
8 import shutil 8 import shutil
9 import sys 9 import sys
10 10
(...skipping 10 matching lines...) Expand all
21 'DEPTH': constants.DIR_SOURCE_ROOT, 21 'DEPTH': constants.DIR_SOURCE_ROOT,
22 'PRODUCT_DIR': constants.GetOutDirectory(), 22 'PRODUCT_DIR': constants.GetOutDirectory(),
23 } 23 }
24 24
25 25
26 def DefaultConfigVariables(): 26 def DefaultConfigVariables():
27 return { 27 return {
28 'CONFIGURATION_NAME': constants.GetBuildType(), 28 'CONFIGURATION_NAME': constants.GetBuildType(),
29 'OS': 'android', 29 'OS': 'android',
30 'asan': '0', 30 'asan': '0',
31 'lsan': '0',
M-A Ruel 2015/02/03 18:54:13 still prefer to keep the list sorted.
earthdok 2015/02/03 19:07:44 Done.
32 'msan': '0',
33 'tsan': '0',
34 'use_custom_libcxx': '0',
35 'use_instrumented_libraries': '0',
31 'chromeos': '0', 36 'chromeos': '0',
32 'component': 'static_library', 37 'component': 'static_library',
33 'fastbuild': '0', 38 'fastbuild': '0',
34 'icu_use_data_file_flag': '1', 39 'icu_use_data_file_flag': '1',
35 'lsan': '0',
36 # TODO(maruel): This may not always be true. 40 # TODO(maruel): This may not always be true.
37 'target_arch': 'arm', 41 'target_arch': 'arm',
38 'use_openssl': '0', 42 'use_openssl': '0',
39 'use_ozone': '0', 43 'use_ozone': '0',
40 'v8_use_external_startup_data': '0', 44 'v8_use_external_startup_data': '0',
41 } 45 }
42 46
43 47
44 class Isolator(object): 48 class Isolator(object):
45 """Manages calls to isolate.py for the android test runner scripts.""" 49 """Manages calls to isolate.py for the android test runner scripts."""
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 shutil.move(os.path.join(root, filename), paks_dir) 157 shutil.move(os.path.join(root, filename), paks_dir)
154 158
155 # Move everything in PRODUCT_DIR to top level. 159 # Move everything in PRODUCT_DIR to top level.
156 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) 160 deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType())
157 if os.path.isdir(deps_product_dir): 161 if os.path.isdir(deps_product_dir):
158 for p in os.listdir(deps_product_dir): 162 for p in os.listdir(deps_product_dir):
159 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir) 163 shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir)
160 os.rmdir(deps_product_dir) 164 os.rmdir(deps_product_dir)
161 os.rmdir(deps_out_dir) 165 os.rmdir(deps_out_dir)
162 166
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698