Add support for startup_tests to tools/valgrind/chrome_tests.py

Also fix a typo and an 80 col nit in its list of tests.

Review URL: http://codereview.chromium.org/79043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13957 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 5 deletions

diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index c63629a..80bfeab 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -30,10 +30,19 @@ class StartupTest : public UITest {
 
   void RunStartupTest(const char* graph, const char* trace,
       bool test_cold, bool important) {
-    const int kNumCycles = 20;
-
-    TimeDelta timings[kNumCycles];
-    for (int i = 0; i < kNumCycles; ++i) {
+    const int kNumCyclesMax = 20;
+    int numCycles = kNumCyclesMax;
+// It's ok for unit test code to use getenv(), isn't it?
+#if defined(OS_WIN)
+#pragma warning( disable : 4996 )
+#endif
+    const char* numCyclesEnv = getenv("STARTUP_TESTS_NUMCYCLES");
+    if (numCyclesEnv && StringToInt(numCyclesEnv, &numCycles))
+      LOG(INFO) << "STARTUP_TESTS_NUMCYCLES set in environment, "
+                << "so setting numCycles to " << numCycles;
+
+    TimeDelta timings[kNumCyclesMax];
+    for (int i = 0; i < numCycles; ++i) {
       if (test_cold) {
         FilePath dir_app;
         ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app));
@@ -70,7 +79,7 @@ class StartupTest : public UITest {
     }
 
     std::string times;
-    for (int i = 0; i < kNumCycles; ++i)
+    for (int i = 0; i < numCycles; ++i)
       StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
     PrintResultList(graph, "", trace, times, "ms", important);
   }