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

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

Issue 5047001: Remove flaky marker from nacl_sandbox_test now that it is fixed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 | « no previous file | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_sandbox_test.h" 5 #include "chrome/test/nacl/nacl_sandbox_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_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 10
(...skipping 18 matching lines...) Expand all
29 dylib_dir = dylib_dir.AppendASCII("nacl_security_tests"); 29 dylib_dir = dylib_dir.AppendASCII("nacl_security_tests");
30 launch_arguments_.AppendSwitchPath(switches::kTestNaClSandbox, dylib_dir); 30 launch_arguments_.AppendSwitchPath(switches::kTestNaClSandbox, dylib_dir);
31 #elif defined(OS_LINUX) 31 #elif defined(OS_LINUX)
32 // We currently do not test the Chrome Linux SUID or seccomp sandboxes. 32 // We currently do not test the Chrome Linux SUID or seccomp sandboxes.
33 #endif 33 #endif
34 } 34 }
35 35
36 NaClSandboxTest::~NaClSandboxTest() { 36 NaClSandboxTest::~NaClSandboxTest() {
37 } 37 }
38 38
39 // http://crbug.com/50121 39 TEST_F(NaClSandboxTest, NaClOuterSBTest) {
40 TEST_F(NaClSandboxTest, FLAKY_NaClOuterSBTest) {
41 // Load a helloworld .nexe to trigger the nacl loader test. 40 // Load a helloworld .nexe to trigger the nacl loader test.
42 FilePath test_file(kSrpcHwHtmlFileName); 41 FilePath test_file(kSrpcHwHtmlFileName);
43 RunTest(test_file, action_max_timeout_ms()); 42 RunTest(test_file, action_max_timeout_ms());
44 } 43 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698