diff options
author | aiolos <aiolos@chromium.org> | 2015-10-07 12:23:22 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-07 19:24:17 +0000 |
commit | 7bc598b417483acf1fce1bb40b5ccee2d46d2e18 (patch) | |
tree | 6306120f22c5a04421132ebbf5569327a28ded12 /tools/perf | |
parent | d552eef4873236c23f20555c43b411381d496c9b (diff) | |
download | chromium_src-7bc598b417483acf1fce1bb40b5ccee2d46d2e18.zip chromium_src-7bc598b417483acf1fce1bb40b5ccee2d46d2e18.tar.gz chromium_src-7bc598b417483acf1fce1bb40b5ccee2d46d2e18.tar.bz2 |
Create tools/perf version of GetChromiumSrcDir.
In preperation for removing GetChromiumSrcDir from Telemetry, move all
usage in tools/perf to a local version of the function.
BUG=511332
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/1382733002
Cr-Commit-Position: refs/heads/master@{#352908}
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/benchmarks/blink_perf.py | 4 | ||||
-rw-r--r-- | tools/perf/benchmarks/indexeddb_perf.py | 6 | ||||
-rw-r--r-- | tools/perf/benchmarks/maps.py | 11 | ||||
-rw-r--r-- | tools/perf/benchmarks/pywebsocket_server.py | 4 | ||||
-rw-r--r-- | tools/perf/benchmarks/spaceport.py | 6 | ||||
-rw-r--r-- | tools/perf/core/path_util.py | 14 |
6 files changed, 29 insertions, 16 deletions
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py index 9a9bb63..e009e30 100644 --- a/tools/perf/benchmarks/blink_perf.py +++ b/tools/perf/benchmarks/blink_perf.py @@ -4,10 +4,10 @@ import os +from core import path_util from core import perf_benchmark from telemetry import benchmark -from telemetry.core import util from telemetry import page as page_module from telemetry.page import page_test from telemetry.page import shared_page_state @@ -18,7 +18,7 @@ from benchmarks import pywebsocket_server from page_sets import webgl_supported_shared_state -BLINK_PERF_BASE_DIR = os.path.join(util.GetChromiumSrcDir(), +BLINK_PERF_BASE_DIR = os.path.join(path_util.GetChromiumSrcDir(), 'third_party', 'WebKit', 'PerformanceTests') SKIPPED_FILE = os.path.join(BLINK_PERF_BASE_DIR, 'Skipped') diff --git a/tools/perf/benchmarks/indexeddb_perf.py b/tools/perf/benchmarks/indexeddb_perf.py index 2de700f..a0fc46c 100644 --- a/tools/perf/benchmarks/indexeddb_perf.py +++ b/tools/perf/benchmarks/indexeddb_perf.py @@ -22,12 +22,12 @@ Cursors: import json import os +from core import path_util from core import perf_benchmark from telemetry import benchmark from telemetry import page as page_module from telemetry import story -from telemetry.core import util from telemetry.page import page_test from telemetry.value import scalar @@ -100,8 +100,8 @@ class IndexedDbOriginal(perf_benchmark.PerfBenchmark): return 'indexeddb_perf' def CreateStorySet(self, options): - indexeddb_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', - 'data', 'indexeddb') + indexeddb_dir = os.path.join(path_util.GetChromiumSrcDir(), 'chrome', + 'test', 'data', 'indexeddb') ps = story.StorySet(base_dir=indexeddb_dir) ps.AddStory(page_module.Page('file://perf_test.html', ps, ps.base_dir)) return ps diff --git a/tools/perf/benchmarks/maps.py b/tools/perf/benchmarks/maps.py index 6924592..900bb90 100644 --- a/tools/perf/benchmarks/maps.py +++ b/tools/perf/benchmarks/maps.py @@ -5,13 +5,12 @@ """Runs a Google Maps performance test. Rerforms several common navigation actions on the map (pan, zoom, rotate)""" -import os import re +from core import path_util from core import perf_benchmark from telemetry import benchmark -from telemetry.core import util from telemetry.page import page as page_module from telemetry.page import page_test from telemetry import story @@ -56,11 +55,9 @@ class MapsBenchmark(perf_benchmark.PerfBenchmark): return 'maps' def CreateStorySet(self, options): - page_set_path = os.path.join( - util.GetChromiumSrcDir(), 'tools', 'perf', 'page_sets') - ps = story.StorySet( - archive_data_file='data/maps.json', base_dir=page_set_path, - cloud_storage_bucket=story.PUBLIC_BUCKET) + ps = story.StorySet(archive_data_file='data/maps.json', + base_dir=path_util.GetStorySetsDir(), + cloud_storage_bucket=story.PUBLIC_BUCKET) ps.AddStory(MapsPage(ps, ps.base_dir)) return ps diff --git a/tools/perf/benchmarks/pywebsocket_server.py b/tools/perf/benchmarks/pywebsocket_server.py index 304d269..494b8db 100644 --- a/tools/perf/benchmarks/pywebsocket_server.py +++ b/tools/perf/benchmarks/pywebsocket_server.py @@ -5,6 +5,8 @@ import os import sys +from core import path_util + from telemetry.core import local_server from telemetry.core import util @@ -15,7 +17,7 @@ class PywebsocketServerBackend(local_server.LocalServerBackend): super(PywebsocketServerBackend, self).__init__() self.port = 8001 self.base_dir = os.path.relpath( - os.path.join(util.GetChromiumSrcDir(), + os.path.join(path_util.GetChromiumSrcDir(), 'third_party', 'pywebsocket', 'src'), start=util.GetTelemetryDir()) diff --git a/tools/perf/benchmarks/spaceport.py b/tools/perf/benchmarks/spaceport.py index 9f2ae32..7bcc809 100644 --- a/tools/perf/benchmarks/spaceport.py +++ b/tools/perf/benchmarks/spaceport.py @@ -7,10 +7,10 @@ import logging import os +from core import path_util from core import perf_benchmark from telemetry import benchmark -from telemetry.core import util from telemetry import page as page_module from telemetry.page import page_test from telemetry import story @@ -114,8 +114,8 @@ class Spaceport(perf_benchmark.PerfBenchmark): return 'spaceport' def CreateStorySet(self, options): - spaceport_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', - 'data', 'third_party', 'spaceport') + spaceport_dir = os.path.join(path_util.GetChromiumSrcDir(), 'chrome', + 'test', 'data', 'third_party', 'spaceport') ps = story.StorySet(base_dir=spaceport_dir) ps.AddStory(page_module.Page('file://index.html', ps, ps.base_dir)) return ps diff --git a/tools/perf/core/path_util.py b/tools/perf/core/path_util.py new file mode 100644 index 0000000..3050c98 --- /dev/null +++ b/tools/perf/core/path_util.py @@ -0,0 +1,14 @@ +# Copyright (c) 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os + + +def GetChromiumSrcDir(): + return os.path.abspath(os.path.join( + os.path.dirname(__file__), os.pardir, os.pardir, os.pardir)) + +def GetStorySetsDir(): + return os.path.abspath(os.path.join( + os.path.dirname(__file__), os.pardir , 'page_sets')) |