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

Unified Diff: chrome/test/nacl/nacl_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_test.h ('k') | chrome/test/nacl/nacl_ui_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_test.cc
===================================================================
--- chrome/test/nacl/nacl_test.cc (revision 100205)
+++ chrome/test/nacl/nacl_test.cc (working copy)
@@ -1,104 +0,0 @@
-// Copyright (c) 2009 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_test.h"
-
-#include "base/file_util.h"
-#include "base/path_service.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/test/automation/tab_proxy.h"
-#include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
-#include "net/base/escape.h"
-#include "net/base/net_util.h"
-
-namespace {
-
-const char kTestCompleteCookie[] = "status";
-const char kTestCompleteSuccess[] = "OK";
-
-const FilePath::CharType kBaseUrl[] =
- FILE_PATH_LITERAL("http://localhost:5103/tests/prebuilt");
-
-} // namespace
-
-NaClTest::NaClTest()
- : use_x64_nexes_(false),
- multiarch_test_(false),
- http_server_(GetTestRootDir(), 5103) {
- launch_arguments_.AppendSwitch(switches::kEnableNaCl);
-
- // Currently we disable some of the sandboxes. See:
- // Make NaCl work in Chromium's Linux seccomp sandbox and the Mac sandbox
- // http://code.google.com/p/nativeclient/issues/detail?id=344
-#if defined(OS_LINUX)
- launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox);
-#endif
- launch_arguments_.AppendSwitchASCII(switches::kLoggingLevel, "0");
-}
-
-NaClTest::~NaClTest() {}
-
-// static
-FilePath NaClTest::GetTestRootDir() {
- FilePath path;
- EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path));
- return path.AppendASCII("native_client");
-}
-
-GURL NaClTest::GetTestUrl(const FilePath& filename) {
- FilePath path(kBaseUrl);
- // Multiarch tests are in the directory defined by kBaseUrl.
- if (!multiarch_test_) {
- if (use_x64_nexes_)
- path = path.AppendASCII("x64");
- else
- path = path.AppendASCII("x86");
- }
- path = path.Append(filename);
- return GURL(path.value());
-}
-
-void NaClTest::WaitForFinish(const FilePath& filename,
- int wait_time) {
- GURL url = GetTestUrl(filename);
- scoped_refptr<TabProxy> tab(GetActiveTab());
- ASSERT_TRUE(tab.get());
- bool test_result = WaitUntilCookieValue(tab.get(),
- url,
- kTestCompleteCookie,
- wait_time,
- kTestCompleteSuccess);
- EXPECT_TRUE(test_result);
-}
-
-void NaClTest::RunTest(const FilePath& filename, int timeout) {
- GURL url = GetTestUrl(filename);
- NavigateToURL(url);
- WaitForFinish(filename, timeout);
-}
-
-void NaClTest::RunMultiarchTest(const FilePath& filename, int timeout) {
- multiarch_test_ = true;
- RunTest(filename, timeout);
-}
-
-void NaClTest::SetUp() {
- FilePath nacl_test_dir = GetTestRootDir();
-#if defined(OS_WIN)
- if (NaClOsIs64BitWindows())
- use_x64_nexes_ = true;
-#elif defined(OS_LINUX) && defined(__LP64__)
- use_x64_nexes_ = true;
-#endif
-
- UITest::SetUp();
-
- ASSERT_TRUE(http_server_.Start());
-}
-
-void NaClTest::TearDown() {
- ASSERT_TRUE(http_server_.Stop());
- UITest::TearDown();
-}
« no previous file with comments | « chrome/test/nacl/nacl_test.h ('k') | chrome/test/nacl/nacl_ui_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698