diff options
| author | msneck@google.com <msneck@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 14:01:42 +0000 |
|---|---|---|
| committer | msneck@google.com <msneck@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 14:01:42 +0000 |
| commit | 179564f585c1b880f754335e68be3b13a6e72e72 (patch) | |
| tree | 4800b5429fb61b72d5645d1a484c5144f27ff223 /chrome/test/nacl | |
| parent | e84e8e8ac15317f9efb5c1cf81f0ddc5463d112d (diff) | |
| download | chromium_src-179564f585c1b880f754335e68be3b13a6e72e72.zip chromium_src-179564f585c1b880f754335e68be3b13a6e72e72.tar.gz chromium_src-179564f585c1b880f754335e68be3b13a6e72e72.tar.bz2 | |
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 and
http://codereview.chromium.org/1525005/show which were both reverted because
of problems on Mac 10.6. This change is identical except for the ";NACL"
lines in renderer.sb files and the corresponding lines in nacl-loader.sb.
Unix socket support for the sandbox changed considerably from 10.5 to 10.6.
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/1559012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index 7d2b6de..1ae70f9 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -62,9 +62,7 @@ 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_MACOSX) - launch_arguments_.AppendSwitch(switches::kNoSandbox); -#elif defined(OS_LINUX) && defined(USE_SECCOMP_SANDBOX) +#if defined(OS_LINUX) && defined(USE_SECCOMP_SANDBOX) launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox); #endif } |