diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/startup/shutdown_test.cc | 12 | ||||
| -rw-r--r-- | chrome/test/startup/startup_test.cc | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc index 902db3b..bd739fb 100644 --- a/chrome/test/startup/shutdown_test.cc +++ b/chrome/test/startup/shutdown_test.cc @@ -58,8 +58,16 @@ class ShutdownTest : public UITest { std::string numCyclesEnv; if (env->GetEnv(env_vars::kStartupTestsNumCycles, &numCyclesEnv) && StringToInt(numCyclesEnv, &numCycles)) { - LOG(INFO) << env_vars::kStartupTestsNumCycles << " set in environment, " - << "so setting numCycles to " << numCycles; + if (numCycles <= kNumCyclesMax) { + LOG(INFO) << env_vars::kStartupTestsNumCycles + << " set in environment, so setting numCycles to " + << numCycles; + } else { + LOG(INFO) << env_vars::kStartupTestsNumCycles + << " is higher than the max, setting numCycles to " + << kNumCyclesMax; + numCycles = kNumCyclesMax; + } } TimeDelta timings[kNumCyclesMax]; diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index ff9ec7e..e1aa8c9 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -70,8 +70,16 @@ class StartupTest : public UITest { std::string numCyclesEnv; if (env->GetEnv(env_vars::kStartupTestsNumCycles, &numCyclesEnv) && StringToInt(numCyclesEnv, &numCycles)) { - LOG(INFO) << env_vars::kStartupTestsNumCycles << " set in environment, " - << "so setting numCycles to " << numCycles; + if (numCycles <= kNumCyclesMax) { + LOG(INFO) << env_vars::kStartupTestsNumCycles + << " set in environment, so setting numCycles to " + << numCycles; + } else { + LOG(INFO) << env_vars::kStartupTestsNumCycles + << " is higher than the max, setting numCycles to " + << kNumCyclesMax; + numCycles = kNumCyclesMax; + } } TimeDelta timings[kNumCyclesMax]; |