summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorfalken <falken@chromium.org>2015-12-06 23:56:37 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-07 07:58:08 +0000
commitdff14b385763e5fd0fecb348e55fe287bfe1019f (patch)
tree7c9d69d2755e03c8a9d62cbc007fb5711dfd307e /tools
parenta0a7d12c76dcdbcd683a3ca5a7ed6cd26dbc65c7 (diff)
downloadchromium_src-dff14b385763e5fd0fecb348e55fe287bfe1019f.zip
chromium_src-dff14b385763e5fd0fecb348e55fe287bfe1019f.tar.gz
chromium_src-dff14b385763e5fd0fecb348e55fe287bfe1019f.tar.bz2
Reenable ref build of service_worker.service_worker_micro_benchmark
Also update a comment about where the micro benchmark comes from. BUG=442752 CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_10_10_perf_bisect;tryserver.chromium.perf:win_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect Review URL: https://codereview.chromium.org/1506683002 Cr-Commit-Position: refs/heads/master@{#363407}
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/benchmarks/service_worker.py10
-rw-r--r--tools/perf/page_sets/service_worker_micro_benchmark.py10
2 files changed, 4 insertions, 16 deletions
diff --git a/tools/perf/benchmarks/service_worker.py b/tools/perf/benchmarks/service_worker.py
index 3ced276..1b464fc 100644
--- a/tools/perf/benchmarks/service_worker.py
+++ b/tools/perf/benchmarks/service_worker.py
@@ -8,7 +8,6 @@ import re
from core import perf_benchmark
-from telemetry import benchmark
from telemetry.core import util
from telemetry.page import action_runner
from telemetry.page import page_test
@@ -95,12 +94,6 @@ class _ServiceWorkerMeasurement(page_test.PageTest):
self._speed_index = speedindex.SpeedIndexMetric()
self._page_open_times = collections.defaultdict(int)
- # TODO(falken): Remove when reference build rolls. crbug.com/458538
- def CustomizeBrowserOptions(self, options):
- options.AppendExtraBrowserArgs([
- '--enable-experimental-web-platform-features'
- ])
-
def WillNavigateToPage(self, page, tab):
self._timeline_controller.SetUp(page, tab)
self._timeline_controller.Start(tab)
@@ -176,9 +169,6 @@ class ServiceWorkerPerfTest(perf_benchmark.PerfBenchmark):
return 'service_worker.service_worker'
-# The reference build is disabled. crbug.com/442752
-# TODO(horo): Enable after the reference build newer than M39 will be rolled.
-@benchmark.Disabled('reference')
class ServiceWorkerMicroBenchmarkPerfTest(perf_benchmark.PerfBenchmark):
"""This test is a microbenchmark of service worker.
diff --git a/tools/perf/page_sets/service_worker_micro_benchmark.py b/tools/perf/page_sets/service_worker_micro_benchmark.py
index dc8fa52..c1e9758 100644
--- a/tools/perf/page_sets/service_worker_micro_benchmark.py
+++ b/tools/perf/page_sets/service_worker_micro_benchmark.py
@@ -26,12 +26,10 @@ class ServiceWorkerMicroBenchmarkPageSet(story.StorySet):
cloud_storage_bucket=story.PUBLIC_BUCKET)
# pylint: disable=line-too-long
- # The code of localhost:8091 is placed in
- # https://github.com/coonsta/Service-Worker-Performance
- # but currently the following is used:
- # https://github.com/amiq11/Service-Worker-Performance/tree/follow_spec_and_many_registration
- # (rev: 3238098ea0225f53dab2f69f7406db8a2712dbf9)
- # This will be merged into the main repository.
+ # The latest code of localhost:8091 is from:
+ # https://github.com/horo-t/Service-Worker-Performance/tree/fix-flakyness
+ # (rev: 0cc35c2398526665399ca99fe53147ff81101408)
+ # TODO(falken): House the code in GoogleChrome's GitHub repository.
# pylint: enable=C0301
# Why: to measure performance of many concurrent fetches
self.AddStory(ServiceWorkerBenchmarkPage(