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

Side by Side Diff: chrome/browser_tests.isolate

Issue 1462693004: Enable building of ppapi_nacl tests for arm/glibc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/common.gypi ('k') | ppapi/ppapi_nacl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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)/browser_tests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ], 118 ],
119 }, 119 },
120 }], 120 }],
121 ['disable_nacl==0 and (OS=="linux" or OS=="win")', { 121 ['disable_nacl==0 and (OS=="linux" or OS=="win")', {
122 'variables': { 122 'variables': {
123 'files': [ 123 'files': [
124 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)', 124 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)',
125 ], 125 ],
126 }, 126 },
127 }], 127 }],
128 ['disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win") and (target_ar ch=="x64" or target_arch=="ia32")', { 128 ['disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win") and (target_ar ch=="x64" or target_arch=="ia32" or target_arch=="arm")', {
129 'variables': { 129 'variables': {
130 'files': [ 130 'files': [
131 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf', 131 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf',
132 ], 132 ],
133 }, 133 },
134 }], 134 }],
135 ['disable_nacl==0 and OS=="linux" and (target_arch=="ia32" or target_arch==" x64" or target_arch=="arm")', { 135 ['disable_nacl==0 and OS=="linux" and (target_arch=="ia32" or target_arch==" x64" or target_arch=="arm")', {
136 'variables': { 136 'variables': {
137 'files': [ 137 'files': [
138 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf', 138 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf',
139 ], 139 ],
140 }, 140 },
141 }], 141 }],
142 ['disable_nacl==0 and OS=="linux" and target_arch=="arm"', { 142 ['disable_nacl==0 and OS=="linux" and target_arch=="arm"', {
143 'variables': { 143 'variables': {
144 'files': [ 144 'files': [
145 '<(PRODUCT_DIR)/libarm/',
146 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_arm.nexe',
145 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_arm.nexe', 147 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_arm.nexe',
146 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm.nexe', 148 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm.nexe',
147 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm_nonsfi.nexe', 149 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm_nonsfi.nexe',
148 ], 150 ],
149 }, 151 },
150 }], 152 }],
151 ['disable_nacl==0 and (OS=="win" or ((OS=="linux" or OS=="mac") and target_a rch=="x64"))', { 153 ['disable_nacl==0 and (OS=="win" or ((OS=="linux" or OS=="mac") and target_a rch=="x64"))', {
152 'variables': { 154 'variables': {
153 'files': [ 155 'files': [
154 '<(PRODUCT_DIR)/lib64/', 156 '<(PRODUCT_DIR)/lib64/',
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 'browser/chromeos/login/test/https_forwarder.py', 265 'browser/chromeos/login/test/https_forwarder.py',
264 ], 266 ],
265 }, 267 },
266 }], 268 }],
267 ], 269 ],
268 'includes': [ 270 'includes': [
269 '../base/base.isolate', 271 '../base/base.isolate',
270 'chrome.isolate', 272 'chrome.isolate',
271 ], 273 ],
272 } 274 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | ppapi/ppapi_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698