diff options
| author | hidehiko <hidehiko@chromium.org> | 2015-06-15 21:08:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-16 04:09:12 +0000 |
| commit | 49ba9b60e381c04abc46052d4f72a9fd113ca87a (patch) | |
| tree | 202f22b4952f1bb3a80e09ad90bb7ab03c950cb5 /chrome/test/nacl | |
| parent | ad8ff5c76ec143f6837f60067ee31c2ed8b2ee2a (diff) | |
| download | chromium_src-49ba9b60e381c04abc46052d4f72a9fd113ca87a.zip chromium_src-49ba9b60e381c04abc46052d4f72a9fd113ca87a.tar.gz chromium_src-49ba9b60e381c04abc46052d4f72a9fd113ca87a.tar.bz2 | |
Non-SFI mode: Switch to newlib.
This CL enables nacl_helper_nonsfi to use by default.
Along with the change, this CL swaps the NonSfi tests
and TransitionalNonSfi tests. (I.e., before this CL
NonSfi tests uses nacl_helper in Non-SFI mode, and
TransitionalNonSfi tests uses nacl_helper_nonsfi. After
this CL, the former uses nacl_helper_nonsfi, and the
latter uses nacl_helper in Non-SFI mode).
TransitionalNonSfi tests will be removed when we clean
up the nacl_helper in Non-SFI mode.
TEST=Ran bots.
BUG=358465
Review URL: https://codereview.chromium.org/1184683002
Cr-Commit-Position: refs/heads/master@{#334551}
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest_util.cc | 2 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest_util.h | 43 |
2 files changed, 24 insertions, 21 deletions
diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc index bd79bdf..3ecb690 100644 --- a/chrome/test/nacl/nacl_browsertest_util.cc +++ b/chrome/test/nacl/nacl_browsertest_util.cc @@ -301,7 +301,7 @@ void NaClBrowserTestNonSfiMode::SetUpCommandLine( void NaClBrowserTestTransitionalNonSfi::SetUpCommandLine( base::CommandLine* command_line) { NaClBrowserTestNonSfiMode::SetUpCommandLine(command_line); - command_line->AppendSwitch(switches::kUseNaClHelperNonSfi); + command_line->AppendSwitchASCII(switches::kUseNaClHelperNonSfi, "false"); } base::FilePath::StringType NaClBrowserTestStatic::Variant() { diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h index b40bf89..cfe4971 100644 --- a/chrome/test/nacl/nacl_browsertest_util.h +++ b/chrome/test/nacl/nacl_browsertest_util.h @@ -137,11 +137,14 @@ class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase { base::FilePath::StringType Variant() override; }; -// "Transitional" here means that this uses nacl_helper_nonsfi which has -// nacl_helper feature for Non-SFI mode, but statically linked to newlib -// instead of using host glibc. It is still under development. -// TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when -// it is launched officially. +// "Transitional" here means that this uses nacl_helper in Non-SFI mode. +// nacl_helper_nonsfi, which is replacing nacl_helper in Non-SFI mode, is being +// launched. In the meanwhile, nacl_helper in Non-SFI is still kept just in +// case. When the launching is successfully done, it will be removed. +// "Transitional" tests are for ensuring compatibility between those two +// binaries. +// TODO(hidehiko): Remove the tests when nacl_helper in Non-SFI mode is +// removed. class NaClBrowserTestPnaclTransitionalNonSfi : public NaClBrowserTestPnaclNonSfi { public: @@ -154,8 +157,8 @@ class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase { base::FilePath::StringType Variant() override; }; -// TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when -// it is launched officially. See NaClBrowserTestPnaclTransitionalNonSfi +// TODO(hidehiko): Remove this when clean-up to drop Non-SFI support from +// nacl_helper is done. See NaClBrowserTestPnaclTransitionalNonSfi // for more details. class NaClBrowserTestTransitionalNonSfi : public NaClBrowserTestNonSfiMode { public: @@ -199,38 +202,38 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc { # define MAYBE_GLIBC(test_name) DISABLED_##test_name #endif -// Sanitizers internally use some syscalls which non-SFI NaCl disallows. +// 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(LEAK_SANITIZER) && \ + (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) # define MAYBE_NONSFI(test_case) test_case #else # define MAYBE_NONSFI(test_case) DISABLED_##test_case #endif -// Currently, we only support it on x86-32 or ARM architecture. -// TODO(hidehiko,mazda): Enable this on x86-64, too, when it is supported. +// Sanitizers internally use some syscalls which non-SFI NaCl disallows. #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) && \ !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \ - !defined(LEAK_SANITIZER) && \ - (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) + !defined(LEAK_SANITIZER) # define MAYBE_TRANSITIONAL_NONSFI(test_case) test_case #else # define MAYBE_TRANSITIONAL_NONSFI(test_case) DISABLED_##test_case #endif -// Currently, translation from pexe to non-sfi nexe is supported only for -// x86-32 or ARM binary. -#if defined(OS_LINUX) && (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) +// Similar to MAYBE_NONSFI, this is available only on x86-32, x86-64 or +// ARM linux. +#if defined(OS_LINUX) && \ + (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)) # define MAYBE_PNACL_NONSFI(test_case) test_case #else # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case #endif -// Similar to MAYBE_TRANSITIONAL_NONSFI, this is available only on x86-32, -// x86-64 or ARM linux. -#if defined(OS_LINUX) && \ - (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)) +// Currently, translation from pexe to non-sfi nexe is supported only for +// x86-32 or ARM binary. +#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 |