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

Side by Side Diff: content/content_browsertests.isolate

Issue 1057153002: content_browsertests.isolate: ppapi_tests requires enable_plugins=1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back to enable_plugins, updating isolate args Created 5 years, 8 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 | « build/isolate.gypi ('k') | 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 (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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 'test/data/', 61 'test/data/',
62 ], 62 ],
63 }, 63 },
64 }], 64 }],
65 ['OS=="linux"', { 65 ['OS=="linux"', {
66 'variables': { 66 'variables': {
67 'files': [ 67 'files': [
68 '<(PRODUCT_DIR)/content_shell.pak', 68 '<(PRODUCT_DIR)/content_shell.pak',
69 '<(PRODUCT_DIR)/libffmpegsumo.so', 69 '<(PRODUCT_DIR)/libffmpegsumo.so',
70 '<(PRODUCT_DIR)/libosmesa.so', 70 '<(PRODUCT_DIR)/libosmesa.so',
71 ],
72 },
73 }],
74 ['OS=="linux" and enable_plugins==1', {
75 'variables': {
76 'files': [
71 '<(PRODUCT_DIR)/libppapi_tests.so', 77 '<(PRODUCT_DIR)/libppapi_tests.so',
72 ], 78 ],
73 }, 79 },
74 }], 80 }],
75 ['OS=="linux" or OS=="mac" or OS=="win"', { 81 ['OS=="linux" or OS=="mac" or OS=="win"', {
76 'variables': { 82 'variables': {
77 'files': [ 83 'files': [
78 '../net/tools/testserver/', 84 '../net/tools/testserver/',
79 '../ppapi/tests/test_case.html', 85 '../ppapi/tests/test_case.html',
80 '../ppapi/tests/test_page.css', 86 '../ppapi/tests/test_page.css',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 ], 143 ],
138 }, 144 },
139 }], 145 }],
140 ], 146 ],
141 'includes': [ 147 'includes': [
142 '../base/base.isolate', 148 '../base/base.isolate',
143 '../gin/v8.isolate', 149 '../gin/v8.isolate',
144 '../third_party/angle/angle.isolate', 150 '../third_party/angle/angle.isolate',
145 ], 151 ],
146 } 152 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698