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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1249693003: Rename angle_deqp_tests to angle_deqp_gles2_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include both expectations files temporarily 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/angle_deqp_tests.isolate ('k') | gpu/gpu.gyp » ('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 3314 matching lines...) Expand 10 before | Expand all | Expand 10 after
3325 ], 3325 ],
3326 'sources': [ 3326 'sources': [
3327 'angle_end2end_tests.isolate', 3327 'angle_end2end_tests.isolate',
3328 ], 3328 ],
3329 }, 3329 },
3330 ], 3330 ],
3331 }], 3331 }],
3332 ['OS=="win"', { 3332 ['OS=="win"', {
3333 'targets': [ 3333 'targets': [
3334 { 3334 {
3335 'target_name': 'angle_deqp_tests_run', 3335 'target_name': 'angle_deqp_gles2_tests_run',
3336 'type': 'none', 3336 'type': 'none',
3337 'dependencies': [ 3337 'dependencies': [
3338 '../gpu/gpu.gyp:angle_deqp_tests', 3338 '../gpu/gpu.gyp:angle_deqp_gles2_tests',
3339 'gpu_tests_base', 3339 'gpu_tests_base',
3340 ], 3340 ],
3341 'sources': [ 3341 'sources': [
3342 'angle_deqp_tests.isolate', 3342 'angle_deqp_gles2_tests.isolate',
3343 ], 3343 ],
3344 }, 3344 },
3345 ], 3345 ],
3346 }], 3346 }],
3347 ], 3347 ],
3348 }], 3348 }],
3349 ], 3349 ],
3350 }], 3350 }],
3351 [ 'enable_mdns == 1', { 3351 [ 'enable_mdns == 1', {
3352 'targets': [{ 3352 'targets': [{
3353 # GN version: //chrome/tools/service_discovery_sniffer 3353 # GN version: //chrome/tools/service_discovery_sniffer
3354 'target_name': 'service_discovery_sniffer', 3354 'target_name': 'service_discovery_sniffer',
3355 'type': 'executable', 3355 'type': 'executable',
3356 'dependencies': [ 3356 'dependencies': [
3357 '../net/net.gyp:net', 3357 '../net/net.gyp:net',
3358 '../base/base.gyp:base', 3358 '../base/base.gyp:base',
3359 '../base/base.gyp:test_support_base', 3359 '../base/base.gyp:test_support_base',
3360 'utility', 3360 'utility',
3361 ], 3361 ],
3362 'sources': [ 3362 'sources': [
3363 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3363 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3364 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3364 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3365 ], 3365 ],
3366 }] 3366 }]
3367 }], 3367 }],
3368 ], # 'conditions' 3368 ], # 'conditions'
3369 } 3369 }
OLDNEW
« no previous file with comments | « chrome/angle_deqp_tests.isolate ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698