components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc - Issue 1154313003: Non-SFI mode: Implement test launcher for nacl_helper_nonsfi_unittests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc

Issue 1154313003: Non-SFI mode: Implement test launcher for nacl_helper_nonsfi_unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/nacl/loader/nonsfi/nacl_helper_nonsfi_unittests.cc ('k') | components/nacl/loader/nonsfi/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc

diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc

index acfc1270149ddfed5852ff2c3d4119da12f83c27..4338fb6fe295555f5f63aa4014aa9b78124f87bc 100644

--- a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc

+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc

@@ -488,14 +488,6 @@ BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,

BPF_TEST_C(NaClNonSfiSandboxTest,

StartingAndJoiningThreadWorks,

nacl::nonsfi::NaClNonSfiBPFSandboxPolicy) {

-#if defined(OS_NACL_NONSFI)

- // base::Thread internally uses LazyInstance, which registers a callback to

- // AtExitManager. However, in PNaCl toolchain build, it is not instantiated

- // by the test runner, unlike host toolchain build (nacl_loader_unittests).

- // Hence, declare it here so that the LazyInstance will work properly.

- base::AtExitManager at_exit;

-#endif

base::Thread thread("sandbox_tests");

BPF_ASSERT(thread.Start());

// |thread|'s destructor will join the thread.