| Index: tools/perf/run_tests
|
| diff --git a/tools/perf/run_tests b/tools/perf/run_tests
|
| index 0ec9c7172bbf5f74a261749dddbeac8aa46e565a..d7d789141f826bf636e47a1ae699e3e19df2a77e 100755
|
| --- a/tools/perf/run_tests
|
| +++ b/tools/perf/run_tests
|
| @@ -12,21 +12,17 @@ import os
|
| import sys
|
|
|
| import perf_tools
|
| -import telemetry.gtest_testrunner
|
| -import telemetry.run_tests
|
| +from telemetry.test import gtest_testrunner
|
| +from telemetry.test import run_tests
|
|
|
| if __name__ == '__main__':
|
| - top_level_dir = os.path.abspath(
|
| - os.path.dirname(__file__))
|
| - runner = telemetry.gtest_testrunner.GTestTestRunner(
|
| - print_result_after_run=False)
|
| + top_level_dir = os.path.abspath(os.path.dirname(__file__))
|
| + runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False)
|
| start_dir = 'perf_tools'
|
| - ret = telemetry.run_tests.Main(
|
| - sys.argv[1:], start_dir, top_level_dir, runner)
|
| + ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner)
|
|
|
| start_dir = 'page_sets'
|
| - ret = ret + telemetry.run_tests.Main(
|
| - sys.argv[1:], start_dir, top_level_dir, runner)
|
| + ret = ret + run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner)
|
|
|
| runner.result.PrintSummary()
|
|
|
|
|