OLD | NEW |
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 15 matching lines...) Expand all Loading... |
26 NaClTest::NaClTest() | 26 NaClTest::NaClTest() |
27 : UITest(), use_x64_nexes_(false) { | 27 : UITest(), use_x64_nexes_(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) && defined(USE_SECCOMP_SANDBOX) |
34 launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox); | 34 launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox); |
35 #endif | 35 #endif |
36 launch_arguments_.AppendSwitchWithValue(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); |
44 path = path.AppendASCII("native_client"); | 44 path = path.AppendASCII("native_client"); |
45 return path; | 45 return path; |
46 } | 46 } |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 | 87 |
88 UITest::SetUp(); | 88 UITest::SetUp(); |
89 | 89 |
90 StartHttpServerWithPort(nacl_test_dir, L"5103"); | 90 StartHttpServerWithPort(nacl_test_dir, L"5103"); |
91 } | 91 } |
92 | 92 |
93 void NaClTest::TearDown() { | 93 void NaClTest::TearDown() { |
94 StopHttpServer(); | 94 StopHttpServer(); |
95 UITest::TearDown(); | 95 UITest::TearDown(); |
96 } | 96 } |
OLD | NEW |