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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 305053002: Added xdisplaycheck target to browser_tests deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added use_x11=1 condition Created 6 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 | no next file » | 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 'includes': [ 5 'includes': [
6 'js_unittest_vars.gypi', 6 'js_unittest_vars.gypi',
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'interactive_ui_tests', 10 'target_name': 'interactive_ui_tests',
(...skipping 2019 matching lines...) Expand 10 before | Expand all | Expand 10 after
2030 }], 2030 }],
2031 ['remoting==1', { 2031 ['remoting==1', {
2032 'dependencies': [ 2032 'dependencies': [
2033 '../remoting/remoting.gyp:remoting_webapp', 2033 '../remoting/remoting.gyp:remoting_webapp',
2034 ] 2034 ]
2035 }, { 2035 }, {
2036 'sources/': [ 2036 'sources/': [
2037 ['exclude', '^test/remoting'], 2037 ['exclude', '^test/remoting'],
2038 ], 2038 ],
2039 }], 2039 }],
2040 ['use_x11==1', {
2041 'dependencies': [
2042 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2043 ],
2044 }],
2040 ], # conditions 2045 ], # conditions
2041 }, # target browser_tests 2046 }, # target browser_tests
2042 { 2047 {
2043 # Executable that runs each perf browser test in a new process. 2048 # Executable that runs each perf browser test in a new process.
2044 'target_name': 'performance_browser_tests', 2049 'target_name': 'performance_browser_tests',
2045 'type': 'executable', 2050 'type': 'executable',
2046 'dependencies': [ 2051 'dependencies': [
2047 'browser', 2052 'browser',
2048 'chrome_resources.gyp:chrome_resources', 2053 'chrome_resources.gyp:chrome_resources',
2049 'chrome_resources.gyp:chrome_strings', 2054 'chrome_resources.gyp:chrome_strings',
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
2991 ['enable_webrtc==1', { 2996 ['enable_webrtc==1', {
2992 'dependencies': [ 2997 'dependencies': [
2993 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2998 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2994 ] 2999 ]
2995 }], 3000 }],
2996 ], 3001 ],
2997 }] 3002 }]
2998 }], 3003 }],
2999 ], # 'conditions' 3004 ], # 'conditions'
3000 } 3005 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698