diff options
author | mazda <mazda@chromium.org> | 2014-11-12 23:19:31 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-13 07:19:56 +0000 |
commit | e1b899fcd22a7c19d35385d2cee81203d6566ca4 (patch) | |
tree | 302df90cbb663db9f0b4420efd8a2e0f2bcadc96 /chrome/browser_tests.isolate | |
parent | 30d61be718d81f89d5b628c0dacf7aa018a60f7f (diff) | |
download | chromium_src-e1b899fcd22a7c19d35385d2cee81203d6566ca4.zip chromium_src-e1b899fcd22a7c19d35385d2cee81203d6566ca4.tar.gz chromium_src-e1b899fcd22a7c19d35385d2cee81203d6566ca4.tar.bz2 |
Enable PPAPI browser tests for Non-SFI ARM.
- Add rules for building browser tests for Non-SFI ARM
- Enable browser tests for Non-SFI ARM
- Modify create_nonsfi_test_nmf.py to support Non-SFI ARM
BUG=372049
TEST=try bot with linux_arm and linux_arm_tester
Review URL: https://codereview.chromium.org/687543002
Cr-Commit-Position: refs/heads/master@{#304000}
Diffstat (limited to 'chrome/browser_tests.isolate')
-rw-r--r-- | chrome/browser_tests.isolate | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index fb2d083..be11cf8 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -106,7 +106,8 @@ ], }, }], - ['disable_nacl==0 and OS=="linux" and target_arch=="ia32"', { + [('disable_nacl==0 and OS=="linux" and ' + '(target_arch=="ia32" or target_arch=="arm")'), { 'variables': { 'files': [ '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf', @@ -118,6 +119,7 @@ 'files': [ '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_arm.nexe', '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm.nexe', + '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_arm_nonsfi.nexe', ], }, }], |