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

Side by Side Diff: content/content_browsertests.isolate

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tryjob failures: forgot to set/check ENABLE_PDF in a couple places. Created 5 years, 3 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 | « content/browser/child_process_launcher.cc ('k') | content/content_tests.gypi » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'conditions': [ 5 'conditions': [
6 ['use_x11==0', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/test_env.py', 9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ], 70 ],
71 }, 71 },
72 }], 72 }],
73 ['OS=="linux" and enable_plugins==1', { 73 ['OS=="linux" and enable_plugins==1', {
74 'variables': { 74 'variables': {
75 'files': [ 75 'files': [
76 '<(PRODUCT_DIR)/libppapi_tests.so', 76 '<(PRODUCT_DIR)/libppapi_tests.so',
77 ], 77 ],
78 }, 78 },
79 }], 79 }],
80 ['enable_plugins==1', {
81 'variables': {
82 'files': [
83 '../ppapi/tests/test_case.html',
84 '../ppapi/tests/test_page.css',
85 ],
86 },
87 }],
80 ['OS=="linux" or OS=="mac" or OS=="win"', { 88 ['OS=="linux" or OS=="mac" or OS=="win"', {
81 'variables': { 89 'variables': {
82 'files': [ 90 'files': [
83 '../net/tools/testserver/', 91 '../net/tools/testserver/',
84 '../ppapi/tests/test_case.html',
85 '../ppapi/tests/test_page.css',
86 '../testing/test_env.py', 92 '../testing/test_env.py',
87 '../third_party/pyftpdlib/', 93 '../third_party/pyftpdlib/',
88 '../third_party/pywebsocket/', 94 '../third_party/pywebsocket/',
89 '../third_party/tlslite/', 95 '../third_party/tlslite/',
90 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 96 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
91 ], 97 ],
92 }, 98 },
93 }], 99 }],
94 ['OS=="mac"', { 100 ['OS=="mac"', {
95 'variables': { 101 'variables': {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 ], 142 ],
137 }, 143 },
138 }], 144 }],
139 ], 145 ],
140 'includes': [ 146 'includes': [
141 '../base/base.isolate', 147 '../base/base.isolate',
142 '../gin/v8.isolate', 148 '../gin/v8.isolate',
143 '../ui/gl/gl.isolate', 149 '../ui/gl/gl.isolate',
144 ], 150 ],
145 } 151 }
OLDNEW
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698