Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(451)

Side by Side Diff: chrome/test/nacl/nacl_test.cc

Issue 5844001: seccomp: remove build-time flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/renderer_main_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/nacl/nacl_test.h" 5 #include "chrome/test/nacl/nacl_test.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/common/chrome_paths.h" 9 #include "chrome/common/chrome_paths.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 12 matching lines...) Expand all
23 23
24 } // namespace 24 } // namespace
25 25
26 NaClTest::NaClTest() 26 NaClTest::NaClTest()
27 : UITest(), use_x64_nexes_(false), multiarch_test_(false) { 27 : UITest(), use_x64_nexes_(false), multiarch_test_(false) {
28 launch_arguments_.AppendSwitch(switches::kEnableNaCl); 28 launch_arguments_.AppendSwitch(switches::kEnableNaCl);
29 29
30 // Currently we disable some of the sandboxes. See: 30 // Currently we disable some of the sandboxes. See:
31 // Make NaCl work in Chromium's Linux seccomp sandbox and the Mac sandbox 31 // Make NaCl work in Chromium's Linux seccomp sandbox and the Mac sandbox
32 // http://code.google.com/p/nativeclient/issues/detail?id=344 32 // http://code.google.com/p/nativeclient/issues/detail?id=344
33 #if defined(OS_LINUX) && defined(USE_SECCOMP_SANDBOX) 33 #if defined(OS_LINUX)
34 launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox); 34 launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox);
35 #endif 35 #endif
36 launch_arguments_.AppendSwitchASCII(switches::kLoggingLevel, "0"); 36 launch_arguments_.AppendSwitchASCII(switches::kLoggingLevel, "0");
37 } 37 }
38 38
39 NaClTest::~NaClTest() {} 39 NaClTest::~NaClTest() {}
40 40
41 FilePath NaClTest::GetTestRootDir() { 41 FilePath NaClTest::GetTestRootDir() {
42 FilePath path; 42 FilePath path;
43 PathService::Get(base::DIR_SOURCE_ROOT, &path); 43 PathService::Get(base::DIR_SOURCE_ROOT, &path);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 UITest::SetUp(); 93 UITest::SetUp();
94 94
95 StartHttpServerWithPort(nacl_test_dir, 5103); 95 StartHttpServerWithPort(nacl_test_dir, 5103);
96 } 96 }
97 97
98 void NaClTest::TearDown() { 98 void NaClTest::TearDown() {
99 StopHttpServer(); 99 StopHttpServer();
100 UITest::TearDown(); 100 UITest::TearDown();
101 } 101 }
OLDNEW
« no previous file with comments | « chrome/renderer/renderer_main_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698