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

Unified Diff: chrome/test/nacl/nacl_sandbox_test.cc

Issue 7831053: Move NaCl tests out of chrome/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/nacl/nacl_sandbox_test.h ('k') | chrome/test/nacl/nacl_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_sandbox_test.cc
===================================================================
--- chrome/test/nacl/nacl_sandbox_test.cc (revision 100205)
+++ chrome/test/nacl/nacl_sandbox_test.cc (working copy)
@@ -1,46 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/test/nacl/nacl_sandbox_test.h"
-
-#include "base/file_util.h"
-#include "base/path_service.h"
-#include "base/test/test_timeouts.h"
-#include "chrome/common/chrome_switches.h"
-
-namespace {
-
-// Base url is specified in nacl_test.
-// We just need to visit a page that will trigger the NaCl loader.
-const FilePath::CharType kANaClHtmlFile[] =
- FILE_PATH_LITERAL("srpc_hw_ppapi.html");
-
-} // namespace
-
-NaClSandboxTest::NaClSandboxTest() {
- // Append the --test-nacl-sandbox=$TESTDLL flag before launching.
- FilePath dylib_dir;
- PathService::Get(base::DIR_EXE, &dylib_dir);
-#if defined(OS_MACOSX)
- dylib_dir = dylib_dir.AppendASCII("libnacl_security_tests.dylib");
- launch_arguments_.AppendSwitchPath(switches::kTestNaClSandbox, dylib_dir);
-#elif defined(OS_WIN)
- // Let the NaCl process detect if it is 64-bit or not and hack on
- // the appropriate suffix to this dll.
- dylib_dir = dylib_dir.AppendASCII("nacl_security_tests");
- launch_arguments_.AppendSwitchPath(switches::kTestNaClSandbox, dylib_dir);
-#elif defined(OS_LINUX)
- // We currently do not test the Chrome Linux SUID or seccomp sandboxes.
-#endif
-}
-
-NaClSandboxTest::~NaClSandboxTest() {
-}
-
-// TODO(bradnelson): re-enable after finding a way to inject env variables.
-TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) {
- // Load a helloworld .nexe to trigger the nacl loader test.
- FilePath test_file(kANaClHtmlFile);
- RunTest(test_file, TestTimeouts::action_max_timeout_ms());
-}
« no previous file with comments | « chrome/test/nacl/nacl_sandbox_test.h ('k') | chrome/test/nacl/nacl_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698