diff options
| author | hidehiko <hidehiko@chromium.org> | 2015-02-02 07:26:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-02 15:27:08 +0000 |
| commit | d3427850741e6d68f265943c25e998b51344d97c (patch) | |
| tree | e4f768d5f774c2f24cc6c2a496dcf4e1c3545f00 /chrome/browser_tests.isolate | |
| parent | 84567ceada9f89c8e962d18ab494b1d1bb5a3830 (diff) | |
| download | chromium_src-d3427850741e6d68f265943c25e998b51344d97c.zip chromium_src-d3427850741e6d68f265943c25e998b51344d97c.tar.gz chromium_src-d3427850741e6d68f265943c25e998b51344d97c.tar.bz2 | |
Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots.
Now, NaCl supports to build x86-32 nonsfi binary even with target_arch=x64,
so this CL enables browser_tests for PPAPI.
BUG=358465
TEST=browser_tests --gtest_filter=*Transitional* locally. Run trybots.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_rel_precise32,linux_arm_compile,linux_arm
Review URL: https://codereview.chromium.org/786273008
Cr-Commit-Position: refs/heads/master@{#314148}
Diffstat (limited to 'chrome/browser_tests.isolate')
| -rw-r--r-- | chrome/browser_tests.isolate | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 4956977..eaf72eb 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -107,7 +107,7 @@ }, }], [('disable_nacl==0 and OS=="linux" and ' - '(target_arch=="ia32" or target_arch=="arm")'), { + '(target_arch=="ia32" or target_arch=="x64" or target_arch=="arm")'), { 'variables': { 'files': [ '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf', @@ -145,6 +145,14 @@ ], }, }], + ['disable_nacl==0 and OS=="linux" and ' + '(target_arch=="x64" or target_arch=="ia32")', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32_nonsfi.nexe', + ], + }, + }], ['OS=="mac"', { 'variables': { 'files': [ |