From 95bc10a47274fa19d9de8bcaafdcc74e9bc4cb54 Mon Sep 17 00:00:00 2001 From: "hamaji@chromium.org" Date: Sat, 10 May 2014 11:38:57 +0000 Subject: Non-SFI NaCl: Stop running sandbox tests in components_unittests Also revert the temporary change for the sandbox test framework, which allows fork() with threads. https://codereview.chromium.org/242383003 TEST=nacl_loader_unittests, components_unittests, and trybots BUG=364751 Review URL: https://codereview.chromium.org/273623002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269558 0039d316-1c4b-4281-b951-d872f2087c98 --- components/components_tests.gyp | 10 ---------- components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc | 5 ----- 2 files changed, 15 deletions(-) (limited to 'components') diff --git a/components/components_tests.gyp b/components/components_tests.gyp index dd19540..590afad 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -391,16 +391,6 @@ 'nacl.gyp:nacl_common', ], }], - ['disable_nacl==0 and OS=="linux"', { - 'sources': [ - 'nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc', - 'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc', - ], - 'dependencies': [ - 'nacl.gyp:nacl_linux', - '../sandbox/sandbox.gyp:sandbox_linux_test_utils', - ], - }], ['OS == "mac"', { 'link_settings': { 'libraries': [ diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc index 5e61d8f..febbcd9 100644 --- a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc +++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc @@ -33,11 +33,6 @@ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h" #include "sandbox/linux/seccomp-bpf/bpf_tests.h" -// This is a hack. TODO(hamaji), fix crbug.com/364751. -namespace sandbox { -extern const bool kAllowForkWithThreads = true; -} - namespace { void DoPipe(base::ScopedFD* fds) { -- cgit v1.1