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

Side by Side Diff: ppapi/tests/extensions/extensions.gyp

Issue 786273008: Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « ppapi/tests/create_nonsfi_test_nmf.py ('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 { 5 {
6 'includes': [ 6 'includes': [
7 '../../../ppapi/ppapi_nacl_test_common.gypi', 7 '../../../ppapi/ppapi_nacl_test_common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 '-xtest_file1:test_file2.txt', 75 '-xtest_file1:test_file2.txt',
76 '-xtest_file2:test_file.txt', 76 '-xtest_file2:test_file.txt',
77 '-xtest_file3:test_file2.txt', 77 '-xtest_file3:test_file2.txt',
78 '-xtest_file4:test_file.txt', 78 '-xtest_file4:test_file.txt',
79 '-xtest_file5:test_file2.txt', 79 '-xtest_file5:test_file2.txt',
80 '-xtest_file6:test_file.txt', 80 '-xtest_file6:test_file.txt',
81 '-xtest_file7:test_file2.txt', 81 '-xtest_file7:test_file2.txt',
82 ], 82 ],
83 }, 83 },
84 'conditions': [ 84 'conditions': [
85 ['target_arch=="ia32" and OS=="linux"', { 85 ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
86 # Enable nonsfi testing only on ia32-linux environment. 86 # Enable nonsfi testing only on ia32-linux environment.
87 # See chrome/test/data/nacl/nacl_test_data.gyp for more info. 87 # See chrome/test/data/nacl/nacl_test_data.gyp for more info.
88 'variables': { 88 'variables': {
89 'build_pnacl_newlib': 1, 89 'build_pnacl_newlib': 1,
90 'translate_pexe_with_build': 1, 90 'translate_pexe_with_build': 1,
91 'enable_x86_32_nonsfi': 1, 91 'enable_x86_32_nonsfi': 1,
92 }, 92 },
93 }], 93 }],
94 ], 94 ],
95 # Shim is a dependency for the nexe because we pre-translate. 95 # Shim is a dependency for the nexe because we pre-translate.
96 'dependencies': [ 96 'dependencies': [
97 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot', 97 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
98 ], 98 ],
99 }, 99 },
100 ], 100 ],
101 } 101 }
OLDNEW
« no previous file with comments | « ppapi/tests/create_nonsfi_test_nmf.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698