summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl/nacl_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/nacl/nacl_test.cc')
-rw-r--r--chrome/test/nacl/nacl_test.cc6
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
}