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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1227843004: Revert of Add support for escaped target names in isolate driver (4th try) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « chrome/chrome.isolate ('k') | chrome/interactive_ui_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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables': { 5 'variables': {
6 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 3135 matching lines...) Expand 10 before | Expand all | Expand 10 after
3146 '../build/isolate.gypi', 3146 '../build/isolate.gypi',
3147 ], 3147 ],
3148 'sources': [ 3148 'sources': [
3149 'chromedriver_unittests.isolate', 3149 'chromedriver_unittests.isolate',
3150 ], 3150 ],
3151 }, 3151 },
3152 { 3152 {
3153 'target_name': 'interactive_ui_tests_run', 3153 'target_name': 'interactive_ui_tests_run',
3154 'type': 'none', 3154 'type': 'none',
3155 'dependencies': [ 3155 'dependencies': [
3156 'chrome',
3157 'interactive_ui_tests', 3156 'interactive_ui_tests',
3158 ], 3157 ],
3159 'conditions': [ 3158 'conditions': [
3160 ['use_x11 == 1', { 3159 ['use_x11 == 1', {
3161 'dependencies': [ 3160 'dependencies': [
3162 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3161 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3163 ], 3162 ],
3164 }], 3163 }],
3165 ], 3164 ],
3166 'includes': [ 3165 'includes': [
3167 '../build/isolate.gypi', 3166 '../build/isolate.gypi',
3168 ], 3167 ],
3169 'sources': [ 3168 'sources': [
3170 'interactive_ui_tests.isolate', 3169 'interactive_ui_tests.isolate',
3171 ], 3170 ],
3172 }, 3171 },
3173 { 3172 {
3174 'target_name': 'sync_integration_tests_run', 3173 'target_name': 'sync_integration_tests_run',
3175 'type': 'none', 3174 'type': 'none',
3176 'dependencies': [ 3175 'dependencies': [
3177 'chrome',
3178 'sync_integration_tests', 3176 'sync_integration_tests',
3179 ], 3177 ],
3180 'conditions': [ 3178 'conditions': [
3181 ['use_x11 == 1', { 3179 ['use_x11 == 1', {
3182 'dependencies': [ 3180 'dependencies': [
3183 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3181 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3184 ], 3182 ],
3185 }], 3183 }],
3186 ], 3184 ],
3187 'includes': [ 3185 'includes': [
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
3340 'utility', 3338 'utility',
3341 ], 3339 ],
3342 'sources': [ 3340 'sources': [
3343 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3341 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3344 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3342 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3345 ], 3343 ],
3346 }] 3344 }]
3347 }], 3345 }],
3348 ], # 'conditions' 3346 ], # 'conditions'
3349 } 3347 }
OLDNEW
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698