build/isolate.gypi - Issue 895923002: Support MSan/TSan in test isolation and test_env.py

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/isolate.gypi

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 error 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 side-by-side diff with in-line comments

Download patch

Index: build/isolate.gypi

diff --git a/build/isolate.gypi b/build/isolate.gypi

index e6d2f98ed375e9328c16e4b4c643244df0648014..d7070fee2aa075cd5351619cc2364f4b730296cd 100644

--- a/build/isolate.gypi

+++ b/build/isolate.gypi

@@ -74,24 +74,28 @@

# the .isolate file but are not considered relative paths.

'--extra-variable', 'version_full=<(version_full)',

- '--config-variable', 'OS=<(OS)',

'--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)',

+ '--config-variable', 'OS=<(OS)',

'--config-variable', 'asan=<(asan)',

'--config-variable', 'chromeos=<(chromeos)',

'--config-variable', 'component=<(component)',

+ '--config-variable', 'disable_nacl=<(disable_nacl)',

'--config-variable', 'fastbuild=<(fastbuild)',

+ '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',

# TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run

# once support for user-defined config variables is added.

'--config-variable',

'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',

- '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',

- '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',

- '--config-variable', 'lsan=<(lsan)',

'--config-variable', 'libpeer_target_type=<(libpeer_target_type)',

- '--config-variable', 'use_openssl=<(use_openssl)',

+ '--config-variable', 'lsan=<(lsan)',

+ '--config-variable', 'msan=<(msan)',

'--config-variable', 'target_arch=<(target_arch)',

+ '--config-variable', 'tsan=<(tsan)',

+ '--config-variable', 'use_custom_libcxx=<(use_custom_libcxx)',

+ '--config-variable', 'use_instrumented_libraries=<(use_instrumented_libraries)',

+ '--config-variable', 'use_openssl=<(use_openssl)',

'--config-variable', 'use_ozone=<(use_ozone)',

- '--config-variable', 'disable_nacl=<(disable_nacl)',

+ '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',

'conditions': [

# Note: When gyp merges lists, it appends them to the old value.

« no previous file with comments | « build/android/pylib/utils/isolator.py ('k') | cc/cc_unittests.isolate » ('j') | no next file with comments »