summaryrefslogtreecommitdiffstats
path: root/chrome/test/startup
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 21:34:27 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 21:34:27 +0000
commite77cda08c5c8647ed457ccaebf2eaa58eab8fca2 (patch)
treeb96fc2616f1c06863af54aac5636a37ad5d29f08 /chrome/test/startup
parent5ee34133e8c2fc8f5fa25f196ee8df69edceab52 (diff)
downloadchromium_src-e77cda08c5c8647ed457ccaebf2eaa58eab8fca2.zip
chromium_src-e77cda08c5c8647ed457ccaebf2eaa58eab8fca2.tar.gz
chromium_src-e77cda08c5c8647ed457ccaebf2eaa58eab8fca2.tar.bz2
Add new tab warm and new tab cold reference build runs.
BUG=28028 Review URL: http://codereview.chromium.org/436040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup')
-rw-r--r--chrome/test/startup/feature_startup_test.cc29
-rw-r--r--chrome/test/startup/startup_test.cc1
2 files changed, 27 insertions, 3 deletions
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index fcb4563..c3b07ea 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -31,6 +31,20 @@ class NewTabUIStartupTest : public UITest {
static const int kNumCycles = 5;
+ void UseReferenceBuild() {
+ 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;
+ }
+
void PrintTimings(const char* label, TimeDelta timings[kNumCycles],
bool important) {
std::string times;
@@ -159,14 +173,25 @@ class NewTabUIStartupTest : public UITest {
}
};
-// TODO(pamg): run these tests with a reference build?
+TEST_F(NewTabUIStartupTest, PerfRefCold) {
+ UseReferenceBuild();
+ RunStartupTest("tab_cold_ref", false /* cold */, true /* important */,
+ UITest::DEFAULT_THEME);
+}
+
TEST_F(NewTabUIStartupTest, PerfCold) {
RunStartupTest("tab_cold", false /* cold */, true /* important */,
UITest::DEFAULT_THEME);
}
+TEST_F(NewTabUIStartupTest, PerfRefWarm) {
+ UseReferenceBuild();
+ RunStartupTest("tab_warm_ref", true /* warm */, true /* not important */,
+ UITest::DEFAULT_THEME);
+}
+
TEST_F(NewTabUIStartupTest, PerfWarm) {
- RunStartupTest("tab_warm", true /* warm */, false /* not important */,
+ RunStartupTest("tab_warm", true /* warm */, true /* not important */,
UITest::DEFAULT_THEME);
}
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 64c4cccf..0934909 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -151,7 +151,6 @@ TEST_F(StartupTest, Perf) {
UITest::DEFAULT_THEME);
}
-// TODO(port): We need a mac reference build checked in for this.
TEST_F(StartupReferenceTest, Perf) {
RunStartupTest("warm", "t_ref", false /* not cold */,
true /* important */, UITest::DEFAULT_THEME);