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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1198923010: Revert "Enable compilation of angle_end2end_tests on Linux" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also revert angle_end2end_tests_run change Created 5 years, 6 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 | « no previous file | 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 3230 matching lines...) Expand 10 before | Expand all | Expand 10 after
3241 'dependencies': [ 3241 'dependencies': [
3242 '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_c onform_test', 3242 '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_c onform_test',
3243 'gpu_tests_base', 3243 'gpu_tests_base',
3244 ], 3244 ],
3245 'sources': [ 3245 'sources': [
3246 'gles2_conform_test.isolate', 3246 'gles2_conform_test.isolate',
3247 ], 3247 ],
3248 }, 3248 },
3249 ], 3249 ],
3250 }], 3250 }],
3251 ['OS=="win" or OS=="linux"', { 3251 ['OS=="win"', {
3252 'targets': [ 3252 'targets': [
3253 { 3253 {
3254 'target_name': 'angle_end2end_tests_run', 3254 'target_name': 'angle_end2end_tests_run',
3255 'type': 'none', 3255 'type': 'none',
3256 'dependencies': [ 3256 'dependencies': [
3257 '../gpu/gpu.gyp:angle_end2end_tests', 3257 '../gpu/gpu.gyp:angle_end2end_tests',
3258 'gpu_tests_base', 3258 'gpu_tests_base',
3259 ], 3259 ],
3260 'sources': [ 3260 'sources': [
3261 'angle_end2end_tests.isolate', 3261 'angle_end2end_tests.isolate',
(...skipping 17 matching lines...) Expand all
3279 'utility', 3279 'utility',
3280 ], 3280 ],
3281 'sources': [ 3281 'sources': [
3282 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3282 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3283 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3283 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3284 ], 3284 ],
3285 }] 3285 }]
3286 }], 3286 }],
3287 ], # 'conditions' 3287 ], # 'conditions'
3288 } 3288 }
OLDNEW
« no previous file with comments | « no previous file | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698