summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 17:12:13 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 17:12:13 +0000
commitbd9337ce8f7afe8dda38ee3afe3dd260507f7c2c (patch)
tree5cf40fd48476896c4d4148f6953b5f106ca03c77 /chrome/test/nacl
parent8bcdfc9fbecfea07eed5b410c4e7b4e118e12dc1 (diff)
downloadchromium_src-bd9337ce8f7afe8dda38ee3afe3dd260507f7c2c.zip
chromium_src-bd9337ce8f7afe8dda38ee3afe3dd260507f7c2c.tar.gz
chromium_src-bd9337ce8f7afe8dda38ee3afe3dd260507f7c2c.tar.bz2
Revert 43086 - 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. 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/1234003 TBR=msneck@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r--chrome/test/nacl/nacl_test.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc
index 6038310..1560484 100644
--- a/chrome/test/nacl/nacl_test.cc
+++ b/chrome/test/nacl/nacl_test.cc
@@ -57,6 +57,9 @@ const FilePath::CharType kServerHtmlFileName[] =
NaClTest::NaClTest()
: UITest() {
launch_arguments_.AppendSwitch(switches::kEnableNaCl);
+#if defined(OS_MACOSX)
+ launch_arguments_.AppendSwitch(switches::kNoSandbox);
+#endif
}
NaClTest::~NaClTest() {}