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

Unified Diff: chrome/test/base/test_launcher_utils.cc

Issue 8036044: Add (not yet working) content_browsertests target. (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/base/test_launcher_utils.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/test_launcher_utils.cc
===================================================================
--- chrome/test/base/test_launcher_utils.cc (revision 103499)
+++ chrome/test/base/test_launcher_utils.cc (working copy)
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/test/base/test_launcher_utils.h"
+
#include "base/command_line.h"
#include "base/environment.h"
#include "base/logging.h"
@@ -10,18 +12,8 @@
#include "base/string_number_conversions.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/test_launcher_utils.h"
#include "ui/gfx/gl/gl_switches.h"
-namespace {
-
-// A multiplier for slow tests. We generally avoid multiplying
-// test timeouts by any constants. Here it is used as last resort
-// to implement the SLOW_ test prefix.
-static const int kSlowTestTimeoutMultiplier = 5;
-
-} // namespace
-
namespace test_launcher_utils {
void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
@@ -94,17 +86,4 @@
return true;
}
-int GetTestTerminationTimeout(const std::string& test_name,
- int default_timeout_ms) {
- int timeout_ms = default_timeout_ms;
-
- // Make it possible for selected tests to request a longer timeout.
- // Generally tests should really avoid doing too much, and splitting
- // a test instead of using SLOW prefix is strongly preferred.
- if (test_name.find("SLOW_") != std::string::npos)
- timeout_ms *= kSlowTestTimeoutMultiplier;
-
- return timeout_ms;
-}
-
} // namespace test_launcher_utils
« no previous file with comments | « chrome/test/base/test_launcher_utils.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698