Index: tools/telemetry/telemetry/benchmark_runner.py |
diff --git a/tools/telemetry/telemetry/benchmark_runner.py b/tools/telemetry/telemetry/benchmark_runner.py |
index 78253600c17f2cba4cc1edf6b8042333fedd8f77..eecb9458d71167fd755f8df30130ca1c303436c8 100644 |
--- a/tools/telemetry/telemetry/benchmark_runner.py |
+++ b/tools/telemetry/telemetry/benchmark_runner.py |
@@ -14,11 +14,11 @@ |
import sys |
from telemetry import benchmark |
+from telemetry.core import discover |
from telemetry import decorators |
from telemetry.internal.browser import browser_finder |
from telemetry.internal.browser import browser_options |
from telemetry.internal.util import command_line |
-from telemetry.util import classes_util |
def PrintBenchmarkList(benchmarks, possible_browser, output_pipe=sys.stdout): |
@@ -264,9 +264,10 @@ |
def _Benchmarks(environment): |
benchmarks = [] |
for search_dir in environment.benchmark_dirs: |
- benchmarks += classes_util.DiscoverClasses(search_dir, |
+ benchmarks += discover.DiscoverClasses(search_dir, |
environment.top_level_dir, |
- benchmark.Benchmark) |
+ benchmark.Benchmark, |
+ index_by_class_name=True).values() |
return benchmarks |
def _MatchBenchmarkName(input_benchmark_name, environment, exact_matches=True): |