diff options
| -rw-r--r-- | tools/perf/perf_tools/__init__.py | 5 | ||||
| -rw-r--r-- | tools/perf/perf_tools/bootstrap_deps | 4 | ||||
| -rwxr-xr-x | tools/perf/run_multipage_benchmarks | 4 | ||||
| -rw-r--r-- | tools/telemetry_tools/__init__.py (renamed from tools/telemetry/tools/__init__.py) | 0 | ||||
| -rw-r--r-- | tools/telemetry_tools/bootstrap_deps (renamed from tools/telemetry/tools/bootstrap_deps) | 0 | ||||
| -rw-r--r-- | tools/telemetry_tools/telemetry_bootstrap.py (renamed from tools/telemetry/tools/telemetry_bootstrap.py) | 0 |
6 files changed, 9 insertions, 4 deletions
diff --git a/tools/perf/perf_tools/__init__.py b/tools/perf/perf_tools/__init__.py index 9106907..e511c1d 100644 --- a/tools/perf/perf_tools/__init__.py +++ b/tools/perf/perf_tools/__init__.py @@ -10,5 +10,10 @@ def Init(): '..', '..', 'telemetry') absolute_telemetry_path = os.path.abspath(telemetry_path) sys.path.append(absolute_telemetry_path) + telemetry_tools_path = os.path.join(os.path.dirname(__file__), + '..', '..', 'telemetry_tools') + absolute_telemetry_tools_path = os.path.abspath(telemetry_tools_path) + sys.path.append(absolute_telemetry_tools_path) + Init() diff --git a/tools/perf/perf_tools/bootstrap_deps b/tools/perf/perf_tools/bootstrap_deps index 3e435ab..b72615a 100644 --- a/tools/perf/perf_tools/bootstrap_deps +++ b/tools/perf/perf_tools/bootstrap_deps @@ -16,6 +16,6 @@ deps = { # perf_tools depends on Telemetry, so pull in the Telemetry deps, too. deps_includes = { - "src/tools/telemetry/tools/bootstrap_deps": - "https://src.chromium.org/chrome/trunk/src/tools/telemetry/tools/bootstrap_deps", + "src/tools/telemetry_tools/bootstrap_deps": + "https://src.chromium.org/chrome/trunk/src/tools/telemetry_tools/bootstrap_deps", } diff --git a/tools/perf/run_multipage_benchmarks b/tools/perf/run_multipage_benchmarks index c404b2d..f46be0a 100755 --- a/tools/perf/run_multipage_benchmarks +++ b/tools/perf/run_multipage_benchmarks @@ -26,7 +26,7 @@ def BootstrapIfNeeded(module_name, module_path, module_deps_url): return except ImportError: bootstrap_txt = urllib.urlopen('http://src.chromium.org/viewvc/chrome/' + - 'trunk/src/tools/telemetry/tools/' + + 'trunk/src/tools/telemetry_tools/' + 'telemetry_bootstrap.py').read() bootstrap = imp.new_module('bootstrap') exec bootstrap_txt in bootstrap.__dict__ @@ -40,7 +40,7 @@ def ListBootstrapDeps(): Returns: a list of telemetry deps. """ - from tools import telemetry_bootstrap + import telemetry_bootstrap deps_file = os.path.join(os.path.dirname(perf_tools.__file__), DEPS_FILE) return telemetry_bootstrap.ListAllDepsPaths(open(deps_file).read()) diff --git a/tools/telemetry/tools/__init__.py b/tools/telemetry_tools/__init__.py index d6646bc..d6646bc 100644 --- a/tools/telemetry/tools/__init__.py +++ b/tools/telemetry_tools/__init__.py diff --git a/tools/telemetry/tools/bootstrap_deps b/tools/telemetry_tools/bootstrap_deps index 887e7ce..887e7ce 100644 --- a/tools/telemetry/tools/bootstrap_deps +++ b/tools/telemetry_tools/bootstrap_deps diff --git a/tools/telemetry/tools/telemetry_bootstrap.py b/tools/telemetry_tools/telemetry_bootstrap.py index 67740c8..67740c8 100644 --- a/tools/telemetry/tools/telemetry_bootstrap.py +++ b/tools/telemetry_tools/telemetry_bootstrap.py |