| Index: tools/perf/fetch_benchmark_deps.py
|
| diff --git a/tools/perf/fetch_benchmark_deps.py b/tools/perf/fetch_benchmark_deps.py
|
| index ac6bd815abbe871c15b09bfd8f53dc81c2b8dea0..2f6fbcb3a7505ebd9477d8099d4f6a3920a1e09a 100755
|
| --- a/tools/perf/fetch_benchmark_deps.py
|
| +++ b/tools/perf/fetch_benchmark_deps.py
|
| @@ -8,19 +8,26 @@
|
| import os
|
| import sys
|
|
|
| -sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'telemetry'))
|
| -
|
| -from catapult_base import cloud_storage
|
| -from telemetry import benchmark_runner
|
| -
|
|
|
| def _GetPerfDir(*subdirs):
|
| - perf_dir = os.path.realpath(os.path.dirname(__file__))
|
| + perf_dir = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
|
| return os.path.join(perf_dir, *subdirs)
|
|
|
|
|
| def GetChromiumDir():
|
| - return _GetPerfDir(os.path.pardir, os.path.pardir, os.path.pardir)
|
| + return os.path.abspath(_GetPerfDir('..', '..', '..'))
|
| +
|
| +
|
| +telemetry_path = os.path.os.path.join(GetChromiumDir(), 'tools', 'telemetry')
|
| +if telemetry_path not in sys.path:
|
| + sys.path.insert(1, telemetry_path)
|
| +catapult_base_path = os.path.join(
|
| + GetChromiumDir(), 'third_party', 'catapult', 'catapult_base')
|
| +if catapult_base_path not in sys.path:
|
| + sys.path.insert(1, catapult_base_path)
|
| +
|
| +from catapult_base import cloud_storage
|
| +from telemetry import benchmark_runner
|
|
|
|
|
| def _FetchDependenciesIfNeeded(story_set):
|
|
|