Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: tools/chrome_proxy/run_benchmark

Issue 955183003: Revert of [Telemetry] Pass test_runner environment in local args instead of a global variable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/gpu/run_gpu_test.py ('k') | tools/perf/run_benchmark » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/chrome_proxy/run_benchmark
diff --git a/tools/chrome_proxy/run_benchmark b/tools/chrome_proxy/run_benchmark
index dfbf07970621a875f8f5c17fcfe6a07ae4b2edd9..fd3ebeb0412122ab369eb799a90f23d81ff960d6 100755
--- a/tools/chrome_proxy/run_benchmark
+++ b/tools/chrome_proxy/run_benchmark
@@ -10,11 +10,10 @@
sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'perf'))
from telemetry import benchmark_runner
+from telemetry.core import environment
if __name__ == '__main__':
- top_level_dir = os.path.dirname(os.path.realpath(__file__))
- environment = benchmark_runner.Environment(
- top_level_dir=top_level_dir,
- benchmark_dirs=[os.path.join(top_level_dir, 'integration_tests')])
- sys.exit(benchmark_runner.main(environment))
+ base_dir = os.path.dirname(os.path.realpath(__file__))
+ benchmark_runner.config = environment.Environment([base_dir])
+ sys.exit(benchmark_runner.main())
« no previous file with comments | « content/test/gpu/run_gpu_test.py ('k') | tools/perf/run_benchmark » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698