diff options
| author | mazda <mazda@chromium.org> | 2015-01-14 08:39:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 16:40:21 +0000 |
| commit | f4aadf3f424b10f8f9e0111229ccf114e598b84e (patch) | |
| tree | 9d31d2c5a85f6c9d5dc590c9d8c5305085ce2e6b /chrome/test/nacl | |
| parent | 88cd03bab636648ef22bc34dee1e31941eb66e58 (diff) | |
| download | chromium_src-f4aadf3f424b10f8f9e0111229ccf114e598b84e.zip chromium_src-f4aadf3f424b10f8f9e0111229ccf114e598b84e.tar.gz chromium_src-f4aadf3f424b10f8f9e0111229ccf114e598b84e.tar.bz2 | |
Enable transitional non-SFI browser tests on ARM
- Produce nacl_helper_nonsfi binary in out/{Debug,Release}
- Enable all transitional non-SFI browser tests on ARM
BUG=433201, 372049
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_rel_precise32,linux_arm_compile,linux_arm
Review URL: https://codereview.chromium.org/794573002
Cr-Commit-Position: refs/heads/master@{#311490}
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest_util.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h index 289a339..8a92224 100644 --- a/chrome/test/nacl/nacl_browsertest_util.h +++ b/chrome/test/nacl/nacl_browsertest_util.h @@ -200,11 +200,12 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc { # define MAYBE_NONSFI(test_case) DISABLED_##test_case #endif -// Currently, we only support it on x86-32 architecture. -// TODO(hidehiko,mazda): Enable this on ARM, too, when it is supported. +// Currently, we only support it on x86-32 or ARM architecture. +// TODO(hidehiko,mazda): Enable this on x86-64, too, when it is supported. #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) && \ !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \ - !defined(LEAK_SANITIZER) && defined(ARCH_CPU_X86) + !defined(LEAK_SANITIZER) && \ + (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) # define MAYBE_TRANSITIONAL_NONSFI(test_case) test_case #else # define MAYBE_TRANSITIONAL_NONSFI(test_case) DISABLED_##test_case @@ -218,10 +219,11 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc { # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case #endif -// Similar to MAYBE_NACL_HELPER_NONSFI, this is not available on ARM yet. +// Similar to MAYBE_TRANSITIONAL_NONSFI, this is available only on x86-32 or +// ARM. // TODO(hidehiko,mazda): Merge this to the MAYBE_PNACL_NONSFI when it is -// supported on ARM. -#if defined(OS_LINUX) && defined(ARCH_CPU_X86) +// supported on x86-64. +#if defined(OS_LINUX) && (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) # define MAYBE_PNACL_TRANSITIONAL_NONSFI(test_case) test_case #else # define MAYBE_PNACL_TRANSITIONAL_NONSFI(test_case) DISABLED_##test_case |