summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 20:04:13 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 20:04:13 +0000
commitf629efa24aa5a5876a239f9bad598ecc1bc31313 (patch)
treeec3b1d6f8323c96e0286b6b2b22a26833867815d /tools/perf
parent60c1bd29b9482f07671ef0cd6033d44336b5c1e7 (diff)
downloadchromium_src-f629efa24aa5a5876a239f9bad598ecc1bc31313.zip
chromium_src-f629efa24aa5a5876a239f9bad598ecc1bc31313.tar.gz
chromium_src-f629efa24aa5a5876a239f9bad598ecc1bc31313.tar.bz2
Revert 213184 "--page-repeat and --pageset-repeat can now be set..."
Buildbot failures: http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%283%29/builds/38250 http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac10.7%20Tests%20%283%29&number=16980 > --page-repeat and --pageset-repeat can now be set to repeat for an amount of time by appending an 's' after the integer > > WillRunPageSet has been renamed to WillRunTest > DidRunPageSet has been renamed to DidRunTest > > > BUG=260008 > > Review URL: https://chromiumcodereview.appspot.com/18261009 TBR=edmundyan@chromium.org Review URL: https://codereview.chromium.org/20057002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/benchmarks/dom_perf.py2
-rw-r--r--tools/perf/measurements/page_cycler.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/benchmarks/dom_perf.py b/tools/perf/benchmarks/dom_perf.py
index 3bc5209..11a2c5d 100644
--- a/tools/perf/benchmarks/dom_perf.py
+++ b/tools/perf/benchmarks/dom_perf.py
@@ -55,7 +55,7 @@ class DomPerfMeasurement(page_measurement.PageMeasurement):
finally:
tab.EvaluateJavaScript('document.cookie = "__domperf_finished=0"')
- def DidRunTest(self, tab, results):
+ def DidRunPageSet(self, tab, results):
# Now give the geometric mean as the total for the combined runs.
scores = []
for result in results.page_results:
diff --git a/tools/perf/measurements/page_cycler.py b/tools/perf/measurements/page_cycler.py
index 46ef187..811d87d 100644
--- a/tools/perf/measurements/page_cycler.py
+++ b/tools/perf/measurements/page_cycler.py
@@ -125,6 +125,6 @@ class PageCycler(page_measurement.PageMeasurement):
int(float(tab.EvaluateJavaScript('__pc_load_time'))),
chart_name='times')
- def DidRunTest(self, tab, results):
+ def DidRunPageSet(self, tab, results):
self._memory_metrics.StopAndGetResults(tab.browser, results)
self.MeasureIO(tab, results)