| Index: chrome/test/data/nacl/BUILD.gn
|
| diff --git a/chrome/test/data/nacl/BUILD.gn b/chrome/test/data/nacl/BUILD.gn
|
| index 9b8671af08215928399474bb6299cdf7dcf77341..e30130d734fc87bd418ea549f2de00752a776dc2 100644
|
| --- a/chrome/test/data/nacl/BUILD.gn
|
| +++ b/chrome/test/data/nacl/BUILD.gn
|
| @@ -2,20 +2,17 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +import("//build/config/features.gni")
|
| import("//build/config/nacl/config.gni")
|
| import("//ppapi/native_client/nacl_test_data.gni")
|
|
|
| group("nacl") {
|
| newlib = "//build/toolchain/nacl:clang_newlib_${target_cpu}"
|
| - glibc = "//build/toolchain/nacl:glibc_${target_cpu}"
|
| pnacl = "//build/toolchain/nacl:newlib_pnacl"
|
| data_deps = [
|
| - ":exit_status_test($glibc)",
|
| ":exit_status_test($newlib)",
|
| ":exit_status_test($pnacl)",
|
| - ":extension_validation_cache($glibc)",
|
| ":extension_validation_cache($newlib)",
|
| - ":irt_exception_test($glibc)",
|
| ":irt_exception_test($newlib)",
|
| ":irt_exception_test($pnacl)",
|
| ":irt_manifest_file($newlib)",
|
| @@ -23,7 +20,6 @@ group("nacl") {
|
| ":pnacl_dyncode_syscall_disabled_test($pnacl)",
|
| ":pnacl_error_handling_test($pnacl)",
|
| ":pnacl_hw_eh_disabled_test($pnacl)",
|
| - ":pnacl_mime_type_test($glibc)",
|
| ":pnacl_mime_type_test($newlib)",
|
| ":pnacl_mime_type_test($pnacl)",
|
| ":pnacl_options_test($pnacl)",
|
| @@ -34,48 +30,57 @@ group("nacl") {
|
| ":ppapi_bad_ppp_initialize_crash($newlib)",
|
| ":ppapi_bad_ppp_instance_didcreate($newlib)",
|
| ":ppapi_bad_ppp_instance_didcreate_crash($newlib)",
|
| - ":ppapi_crash_in_callback($glibc)",
|
| ":ppapi_crash_in_callback($newlib)",
|
| ":ppapi_crash_in_callback($pnacl)",
|
| - ":ppapi_crash_off_main_thread($glibc)",
|
| ":ppapi_crash_off_main_thread($newlib)",
|
| ":ppapi_crash_off_main_thread($pnacl)",
|
| - ":ppapi_crash_ppapi_off_main_thread($glibc)",
|
| ":ppapi_crash_ppapi_off_main_thread($newlib)",
|
| ":ppapi_crash_ppapi_off_main_thread($pnacl)",
|
| - ":ppapi_crash_via_check_failure($glibc)",
|
| ":ppapi_crash_via_check_failure($newlib)",
|
| ":ppapi_crash_via_check_failure($pnacl)",
|
| - ":ppapi_crash_via_exit_call($glibc)",
|
| ":ppapi_crash_via_exit_call($newlib)",
|
| ":ppapi_crash_via_exit_call($pnacl)",
|
| ":ppapi_extension_mime_handler($newlib)",
|
| - ":ppapi_ppb_core($glibc)",
|
| ":ppapi_ppb_core($newlib)",
|
| ":ppapi_ppb_core($pnacl)",
|
| - ":ppapi_ppb_instance($glibc)",
|
| ":ppapi_ppb_instance($newlib)",
|
| ":ppapi_ppb_instance($pnacl)",
|
| - ":ppapi_ppp_instance($glibc)",
|
| ":ppapi_ppp_instance($newlib)",
|
| ":ppapi_ppp_instance($pnacl)",
|
| - ":ppapi_progress_events($glibc)",
|
| ":ppapi_progress_events($newlib)",
|
| ":ppapi_progress_events($pnacl)",
|
| - ":shared_test_files($glibc)",
|
| ":shared_test_files($newlib)",
|
| ":shared_test_files($pnacl)",
|
| - ":simple_test($glibc)",
|
| ":simple_test($newlib)",
|
| ":simple_test($pnacl)",
|
| - ":sysconf_nprocessors_onln_test($glibc)",
|
| ":sysconf_nprocessors_onln_test($newlib)",
|
| ":sysconf_nprocessors_onln_test($pnacl)",
|
| ]
|
| if (target_cpu != "arm") {
|
| data_deps += [ ":partly_invalid($newlib)" ]
|
| }
|
| - if (is_linux) {
|
| + if (target_cpu != "mipsel") {
|
| + glibc = "//build/toolchain/nacl:glibc_${target_cpu}"
|
| + data_deps += [
|
| + ":exit_status_test($glibc)",
|
| + ":extension_validation_cache($glibc)",
|
| + ":irt_exception_test($glibc)",
|
| + ":pnacl_mime_type_test($glibc)",
|
| + ":ppapi_crash_in_callback($glibc)",
|
| + ":ppapi_crash_off_main_thread($glibc)",
|
| + ":ppapi_crash_ppapi_off_main_thread($glibc)",
|
| + ":ppapi_crash_via_check_failure($glibc)",
|
| + ":ppapi_crash_via_exit_call($glibc)",
|
| + ":ppapi_ppb_core($glibc)",
|
| + ":ppapi_ppb_instance($glibc)",
|
| + ":ppapi_ppp_instance($glibc)",
|
| + ":ppapi_progress_events($glibc)",
|
| + ":shared_test_files($glibc)",
|
| + ":simple_test($glibc)",
|
| + ":sysconf_nprocessors_onln_test($glibc)",
|
| + ]
|
| + }
|
| + if (is_linux && enable_nacl_nonsfi) {
|
| nonsfi = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
|
| data_deps += [
|
| ":irt_exception_test($nonsfi)",
|
| @@ -518,15 +523,6 @@ if (is_nacl && !is_nacl_nonsfi) {
|
| "//native_client/tests/stubout_mode/partly_invalid.c",
|
| ]
|
| destination_dir = "nacl_test_data"
|
| - if (target_cpu == "mipsel") {
|
| - cflags = [
|
| - "--pnacl-mips-bias",
|
| - "-arch",
|
| - "mips32",
|
| - "--pnacl-allow-translate",
|
| - ]
|
| - ldflags = [ "--pnacl-allow-native" ]
|
| - }
|
| }
|
| }
|
| }
|
|
|