diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 19:47:41 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 19:47:41 +0000 |
| commit | 39c4e1a8b2343b3883a098a8e0d21fb8bd3204cf (patch) | |
| tree | 456e767833a5abfca7ab89ba2e66c8935cfab1f7 /chrome/test/nacl/nacl_test.cc | |
| parent | 3cd488a822976fd97aeb7e5237e483100a24fa12 (diff) | |
| download | chromium_src-39c4e1a8b2343b3883a098a8e0d21fb8bd3204cf.zip chromium_src-39c4e1a8b2343b3883a098a8e0d21fb8bd3204cf.tar.gz chromium_src-39c4e1a8b2343b3883a098a8e0d21fb8bd3204cf.tar.bz2 | |
linux: enable seccomp sandbox by default
It seems the best way to keep the seccomp sandbox working is to have
everyone's development environment have it on by default. So we turn
on the seccomp sandbox, but only for non-official builds.
If the build-time flag is set: --disable-seccomp-sandbox turns it off.
If the build-time flag is *not* set: --enable-seccomp-sandbox turns it on.
BUG=36133
Review URL: http://codereview.chromium.org/1558003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl/nacl_test.cc')
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index 1560484..456cc1d 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -57,8 +57,14 @@ const FilePath::CharType kServerHtmlFileName[] = NaClTest::NaClTest() : UITest() { launch_arguments_.AppendSwitch(switches::kEnableNaCl); + + // 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) + launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox); #endif } |