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

Side by Side Diff: build/isolate.gypi

Issue 936303002: Make Xvfb for browser_tests dependent on use_x11 instead of OS=="linux" Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: even smaller patch 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
« no previous file with comments | « build/android/pylib/utils/isolator.py ('k') | chrome/browser_tests.isolate » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # This file is meant to be included into a target to provide a rule 5 # This file is meant to be included into a target to provide a rule
6 # to "build" .isolate files into a .isolated file. 6 # to "build" .isolate files into a .isolated file.
7 # 7 #
8 # To use this, create a gyp target with the following form: 8 # To use this, create a gyp target with the following form:
9 # 'conditions': [ 9 # 'conditions': [
10 # ['test_isolation_mode != "noop"', { 10 # ['test_isolation_mode != "noop"', {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', 89 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)',
90 '--config-variable', 'lsan=<(lsan)', 90 '--config-variable', 'lsan=<(lsan)',
91 '--config-variable', 'msan=<(msan)', 91 '--config-variable', 'msan=<(msan)',
92 '--config-variable', 'target_arch=<(target_arch)', 92 '--config-variable', 'target_arch=<(target_arch)',
93 '--config-variable', 'tsan=<(tsan)', 93 '--config-variable', 'tsan=<(tsan)',
94 '--config-variable', 'use_custom_libcxx=<(use_custom_libcxx)', 94 '--config-variable', 'use_custom_libcxx=<(use_custom_libcxx)',
95 '--config-variable', 'use_instrumented_libraries=<(use_instrumented_libr aries)', 95 '--config-variable', 'use_instrumented_libraries=<(use_instrumented_libr aries)',
96 '--config-variable', 'use_openssl=<(use_openssl)', 96 '--config-variable', 'use_openssl=<(use_openssl)',
97 '--config-variable', 'use_ozone=<(use_ozone)', 97 '--config-variable', 'use_ozone=<(use_ozone)',
98 '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_sta rtup_data)', 98 '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_sta rtup_data)',
99 '--config-variable', 'use_x11=<(use_x11)',
99 ], 100 ],
100 'conditions': [ 101 'conditions': [
101 # Note: When gyp merges lists, it appends them to the old value. 102 # Note: When gyp merges lists, it appends them to the old value.
102 ['OS=="mac"', { 103 ['OS=="mac"', {
103 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) 104 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
104 # form. 105 # form.
105 'action': [ 106 'action': [
106 '--extra-variable', 'mac_product_name', '<(mac_product_name)', 107 '--extra-variable', 'mac_product_name', '<(mac_product_name)',
107 ], 108 ],
108 }], 109 }],
109 ["test_isolation_outdir!=''", { 110 ["test_isolation_outdir!=''", {
110 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], 111 'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
111 }], 112 }],
112 ['test_isolation_fail_on_missing == 0', { 113 ['test_isolation_fail_on_missing == 0', {
113 'action': ['--ignore_broken_items'], 114 'action': ['--ignore_broken_items'],
114 }], 115 }],
115 ["test_isolation_mode == 'prepare'", { 116 ["test_isolation_mode == 'prepare'", {
116 'outputs': [ 117 'outputs': [
117 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json', 118 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json',
118 ], 119 ],
119 }, { 120 }, {
120 'outputs': [ 121 'outputs': [
121 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', 122 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
122 ], 123 ],
123 }], 124 }],
124 ], 125 ],
125 }, 126 },
126 ], 127 ],
127 } 128 }
OLDNEW
« no previous file with comments | « build/android/pylib/utils/isolator.py ('k') | chrome/browser_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698