diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 21:11:16 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 21:11:16 +0000 |
| commit | e5511265a24b1cdef66178b417e96259d62ce1b5 (patch) | |
| tree | 33dc5093d3b902f269a7f21055134c45c19a62a2 /chrome/test/nacl | |
| parent | ee55219bf9a3787ff77b69e3fa5fcbee7bf98376 (diff) | |
| download | chromium_src-e5511265a24b1cdef66178b417e96259d62ce1b5.zip chromium_src-e5511265a24b1cdef66178b417e96259d62ce1b5.tar.gz chromium_src-e5511265a24b1cdef66178b417e96259d62ce1b5.tar.bz2 | |
Revert 43253 - 1. Create a new sandbox type which allows access to Unix sockets in the Mac
renderer sandbox to support running Native Client.
2. Put the Native Client sel_ldr (which contains the user's untrusted code)
into a new Mac sandbox type.
3. Open /dev/random in SandboxWarmup().
4. Remove the "nosandbox" flag when running Mac tests.
See http://codereview.chromium.org/1234003/show which was reverted because of
problems on Mac 10.6. This change is identical except for the ";NACL" lines
in the *.sb files. I've removed the 10.6specific sandbox commands and used
the generic commands that work on 10.5 and 10.6. I will work on adding the
10.6specific commands in a different change list.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=327
TEST=nacl_ui_tests still pass while running in the sandbox.
Review URL: http://codereview.chromium.org/1525005
TBR=msneck@google.com
Review URL: http://codereview.chromium.org/1572009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index 1ae70f9..7d2b6de 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -62,7 +62,9 @@ NaClTest::NaClTest() // Currently we disable some of the sandboxes. See: // Make NaCl work in Chromium's Linux seccomp sandbox and the Mac sandbox // http://code.google.com/p/nativeclient/issues/detail?id=344 -#if defined(OS_LINUX) && defined(USE_SECCOMP_SANDBOX) +#if defined(OS_MACOSX) + launch_arguments_.AppendSwitch(switches::kNoSandbox); +#elif defined(OS_LINUX) && defined(USE_SECCOMP_SANDBOX) launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox); #endif } |