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

Side by Side Diff: build/isolate.gypi

Issue 843713002: Revert "Use Xvfb in isolated testing only if use_x11 is set" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 # once support for user-defined config variables is added. 84 # once support for user-defined config variables is added.
85 '--config-variable', 85 '--config-variable',
86 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', 86 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
87 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', 87 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
88 '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_sta rtup_data)', 88 '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_sta rtup_data)',
89 '--config-variable', 'lsan=<(lsan)', 89 '--config-variable', 'lsan=<(lsan)',
90 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', 90 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)',
91 '--config-variable', 'use_openssl=<(use_openssl)', 91 '--config-variable', 'use_openssl=<(use_openssl)',
92 '--config-variable', 'target_arch=<(target_arch)', 92 '--config-variable', 'target_arch=<(target_arch)',
93 '--config-variable', 'use_ozone=<(use_ozone)', 93 '--config-variable', 'use_ozone=<(use_ozone)',
94 '--config-variable', 'use_x11=<(use_x11)',
95 '--config-variable', 'disable_nacl=<(disable_nacl)', 94 '--config-variable', 'disable_nacl=<(disable_nacl)',
96 ], 95 ],
97 'conditions': [ 96 'conditions': [
98 # Note: When gyp merges lists, it appends them to the old value. 97 # Note: When gyp merges lists, it appends them to the old value.
99 ['OS=="mac"', { 98 ['OS=="mac"', {
100 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) 99 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
101 # form. 100 # form.
102 'action': [ 101 'action': [
103 '--extra-variable', 'mac_product_name', '<(mac_product_name)', 102 '--extra-variable', 'mac_product_name', '<(mac_product_name)',
104 ], 103 ],
(...skipping 10 matching lines...) Expand all
115 ], 114 ],
116 }, { 115 }, {
117 'outputs': [ 116 'outputs': [
118 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', 117 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
119 ], 118 ],
120 }], 119 }],
121 ], 120 ],
122 }, 121 },
123 ], 122 ],
124 } 123 }
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