Commit ba06ce03 authored by Derek Schuff's avatar Derek Schuff Committed by Commit Bot

Disable NaCl Glibc tests on Mac

The nacl-gcc toolchain no longer runs on recent version of MacOS.
Coverage of the glibc toolchain's use of the Pepper ABIs will continue
on Linux/Win.

Change-Id: Id60229cfde0fca368a28f708994b26c479326606
Bug: 1013169
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1888723Reviewed-by: default avatarBill Budge <bbudge@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711087}
parent df73ce4a
......@@ -61,7 +61,9 @@ group("nacl") {
if (target_cpu != "arm") {
data_deps += [ ":partly_invalid($newlib)" ]
}
if (target_cpu != "mipsel") {
if (target_cpu != "mipsel" && !is_mac) {
# GlibC tools are not available for MIPS
# The GlibC toolchain is based on gcc, which no longer runs on mac
glibc = "//build/toolchain/nacl:glibc_${target_cpu}"
data_deps += [
":exit_status_test($glibc)",
......@@ -612,6 +614,7 @@ if (is_linux && is_clang) {
# Do not use any sanitizers or coverage tools, which require a few symbols.
configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ]
configs -= [ "//build/config/coverage:default_coverage" ]
# Disable default_init_stack_vars because it inserts memset() calls, but
# memset() is not available in this libc-free context.
configs -= [ "//build/config/compiler:default_init_stack_vars" ]
......
......@@ -177,7 +177,8 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
#endif
// NaCl glibc toolchain is not available on MIPS
#if defined(ARCH_CPU_MIPS_FAMILY)
// It also no longer runs on recent versions of MacOS
#if defined(ARCH_CPU_MIPS_FAMILY) || defined(OS_MACOSX)
# define MAYBE_GLIBC(test_name) DISABLED_##test_name
#else
# define MAYBE_GLIBC(test_name) test_name
......
......@@ -486,7 +486,7 @@ if (enable_nacl) {
":ppapi_nacl_tests(//build/toolchain/nacl:newlib_pnacl)",
]
if (target_cpu != "mipsel") {
if (target_cpu != "mipsel" && !is_mac) {
data_deps +=
[ ":ppapi_nacl_tests(//build/toolchain/nacl:glibc_${target_cpu})" ]
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment