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 /ppapi/ppapi_nacl.gyp | |
| 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 'ppapi/ppapi_nacl.gyp')
| -rw-r--r-- | ppapi/ppapi_nacl.gyp | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp index bbad955..9fdabc3 100644 --- a/ppapi/ppapi_nacl.gyp +++ b/ppapi/ppapi_nacl.gyp @@ -235,7 +235,7 @@ }, ], }], - ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="arm") and OS=="linux"', { + ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="x64" or target_arch=="arm") and OS=="linux"', { # In addition to above configuration, build x86-32 and arm nonsfi # .nexe files by translating from .pexe binary, for non-SFI mode PPAPI # testing. @@ -244,7 +244,7 @@ 'nmf_nonsfi%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_nonsfi.nmf', }, 'conditions': [ - ['target_arch=="ia32"', { + ['target_arch=="ia32" or target_arch=="x64"', { 'variables': { 'enable_x86_32_nonsfi': 1, }, @@ -270,17 +270,35 @@ '--output=>(nmf_nonsfi)', ], 'target_conditions': [ - ['enable_x86_32_nonsfi==1', { + ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="ia32"', { + 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'], 'action': [ '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)', '--arch=x86-32', - ], + ] + }], + ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="x64"', { + 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'], + 'action': [ + '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)', + # This should be used only for nacl_helper_nonsfi test. + # In theory this should be x86-32. However, currently + # fallback logic to x86-32-nonsfi is not implemented, + # and, moreover, it would break the tests for current + # nacl_helper in Non-SFI mode on x64 Chrome. + # So, here we introduce the hack to use "x86-64" in order + # to take the benefit to run nacl_helper_nonsfi tests on + # x64 Chrome. + # TODO(hidehiko): Remove this hack. + '--arch=x86-64', + ] }], ['enable_arm_nonsfi==1', { + 'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'], 'action': [ '--program=>(out_pnacl_newlib_arm_nonsfi_nexe)', '--arch=arm', - ], + ] }], ], }, |