diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 18:01:37 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 18:01:37 +0000 |
| commit | cd023e807914d91d64e325391bde25ff0bdea3f3 (patch) | |
| tree | 994605d670e0aa7aa47dc05272b64df75875ad45 /chrome/test/nacl | |
| parent | a3ce42652334753017d67ecb4f68524acc6e04cb (diff) | |
| download | chromium_src-cd023e807914d91d64e325391bde25ff0bdea3f3.zip chromium_src-cd023e807914d91d64e325391bde25ff0bdea3f3.tar.gz chromium_src-cd023e807914d91d64e325391bde25ff0bdea3f3.tar.bz2 | |
Prepare for running nacl_ui_test on Mac and Linux.
This is the NaCl-Chrome integration test that runs in Chrome waterfall, currently on Windows only. I am working on starting new bots that will run it on Mac and Linux.
Review URL: http://codereview.chromium.org/563021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -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 5b9c85a..f075187 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -29,6 +29,12 @@ static const FilePath::CharType kServerHtmlFileName[] = NaClTest::NaClTest() : UITest() { launch_arguments_.AppendSwitch(switches::kInternalNaCl); +#if defined(OS_MACOSX) || defined(OS_LINUX) + launch_arguments_.AppendSwitch(switches::kNoSandbox); +#endif +#if defined(OS_MACOSX) + launch_arguments_.AppendSwitch(switches::kEnableNaClOnMac); +#endif } NaClTest::~NaClTest() {} |