| Index: content/test/gpu/run_gpu_tests
|
| diff --git a/tools/perf/run_multipage_benchmarks b/content/test/gpu/run_gpu_tests
|
| similarity index 74%
|
| copy from tools/perf/run_multipage_benchmarks
|
| copy to content/test/gpu/run_gpu_tests
|
| index ca4115f1216d96dc490be2852c58f763ff59c188..099dbae09bb731d444f20a2eaf010e3ff1ce29f8 100755
|
| --- a/tools/perf/run_multipage_benchmarks
|
| +++ b/content/test/gpu/run_gpu_tests
|
| @@ -19,7 +19,7 @@ def bootstrapIfNeeded(module_name, module_path, module_deps_url):
|
| except ImportError:
|
| sys.path.append(os.path.join(os.path.dirname(__file__),
|
| BOOTSTRAPPED_FILES_DIR,
|
| - module_path))
|
| + module_path))
|
| try:
|
| imp.find_module(module_name)
|
| return
|
| @@ -35,10 +35,14 @@ def bootstrapIfNeeded(module_name, module_path, module_deps_url):
|
|
|
|
|
| if __name__ == '__main__':
|
| - bootstrapIfNeeded('perf_tools', 'src/tools/perf',
|
| - 'http://src.chromium.org/viewvc/chrome/trunk/src/tools/' +
|
| - 'perf/perf_lib/bootstrap_deps')
|
| - import perf_tools
|
| - from telemetry.page import multi_page_benchmark_runner
|
| - benchmark_dir = os.path.join(os.path.dirname(__file__), 'perf_tools')
|
| - sys.exit(multi_page_benchmark_runner.Main(benchmark_dir))
|
| + bootstrapIfNeeded('gpu_tests', 'src/content/test/gpu',
|
| + 'http://src.chromium.org/viewvc/chrome/trunk/src/content/' +
|
| + 'test/gpu/gpu_tests/bootstrap_deps')
|
| + import gpu_tests
|
| + from telemetry.page import page_test_runner
|
| + test_dir = os.path.join(os.path.dirname(__file__), 'gpu_tests')
|
| +
|
| + import page_sets # pylint: disable=F0401
|
| + page_set_filenames = page_sets.GetAllPageSetFilenames()
|
| +
|
| + sys.exit(page_test_runner.Main(test_dir, page_set_filenames))
|
|
|