summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl
diff options
context:
space:
mode:
authormazda <mazda@chromium.org>2014-11-12 23:19:31 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-13 07:19:56 +0000
commite1b899fcd22a7c19d35385d2cee81203d6566ca4 (patch)
tree302df90cbb663db9f0b4420efd8a2e0f2bcadc96 /chrome/test/nacl
parent30d61be718d81f89d5b628c0dacf7aa018a60f7f (diff)
downloadchromium_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/test/nacl')
-rw-r--r--chrome/test/nacl/nacl_browsertest_util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
index 4a7c3c6..ac084d0 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -182,8 +182,8 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
#endif
// Currently, translation from pexe to non-sfi nexe is supported only for
-// x86-32 binary.
-#if defined(OS_LINUX) && defined(ARCH_CPU_X86)
+// x86-32 or ARM binary.
+#if defined(OS_LINUX) && (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL))
# define MAYBE_PNACL_NONSFI(test_case) test_case
#else
# define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case