summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-21 08:11:39 +0000
committerchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-21 08:11:39 +0000
commit045405a100cc6272913ecf978cd16312c2153c4c (patch)
treeec15ae1522c49129fe37dacd0991a708cd878f96 /chrome/test
parentf0ed02aa9a3820f83e4837a1776134d5c73cc5e6 (diff)
downloadchromium_src-045405a100cc6272913ecf978cd16312c2153c4c.zip
chromium_src-045405a100cc6272913ecf978cd16312c2153c4c.tar.gz
chromium_src-045405a100cc6272913ecf978cd16312c2153c4c.tar.bz2
Reuse UseReferenceBuild() cleanup in startup test.
BUG=none TEST=startup test continues running Review URL: http://codereview.chromium.org/507059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/startup/startup_test.cc24
1 files changed, 3 insertions, 21 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 1a9ee84..9611bc1 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -127,31 +127,13 @@ class StartupTest : public UITest {
std::string pages_;
};
-class StartupReferenceTest : public StartupTest {
- public:
- // override the browser directory that is used by UITest::SetUp to cause it
- // to use the reference build instead.
- void SetUp() {
- FilePath dir;
- PathService::Get(chrome::DIR_TEST_TOOLS, &dir);
- dir = dir.AppendASCII("reference_build");
-#if defined(OS_WIN)
- dir = dir.AppendASCII("chrome");
-#elif defined(OS_LINUX)
- dir = dir.AppendASCII("chrome_linux");
-#elif defined(OS_MACOSX)
- dir = dir.AppendASCII("chrome_mac");
-#endif
- browser_directory_ = dir;
- }
-};
-
-TEST_F(StartupTest, Perf) {
+TEST_F(StartupTest, PerfWarm) {
RunStartupTest("warm", "t", false /* not cold */, true /* important */,
UITest::DEFAULT_THEME);
}
-TEST_F(StartupReferenceTest, Perf) {
+TEST_F(StartupTest, PerfReferenceWarm) {
+ UseReferenceBuild();
RunStartupTest("warm", "t_ref", false /* not cold */,
true /* important */, UITest::DEFAULT_THEME);
}