Index: tools/perf/run_measurement |
diff --git a/tools/perf/run_measurement b/tools/perf/run_measurement |
index 362a94343eb1d7df2926bea3aa4aa3d67ca546a5..485bf56273a7058729d505e741dd849b4a8f4967 100755 |
--- a/tools/perf/run_measurement |
+++ b/tools/perf/run_measurement |
@@ -9,7 +9,6 @@ import sys |
sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) |
from telemetry import test_runner |
-from telemetry.core import environment |
from telemetry.core import util |
from telemetry.util import bootstrap |
@@ -23,9 +22,14 @@ def main(): |
print bootstrap.ListAllDepsPaths(CROS_BOOSTRAP_DEPS_PATH) |
return 0 |
- base_dir = os.path.dirname(os.path.realpath(__file__)) |
- test_runner.config = environment.Environment([base_dir]) |
- sys.exit(test_runner.main()) |
+ top_level_dir = os.path.dirname(os.path.realpath(__file__)) |
+ environment = test_runner.Environment( |
+ top_level_dir=top_level_dir, |
+ test_dirs=[os.path.join(top_level_dir, 'benchmarks')], |
+ page_test_dirs=[os.path.join(top_level_dir, 'measurements')], |
+ page_set_dirs=[os.path.join(top_level_dir, 'page_sets')] |
+ ) |
+ return test_runner.main(environment) |
if __name__ == '__main__': |