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

Unified Diff: tools/perf/run_tests

Issue 397483002: Move chrome_proxy tests from under tools/perf to tools/chrome_proxy/integration_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated tools/perf/run_tests to include chrome_proxy tests. Created 6 years, 5 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 | « tools/perf/page_sets/data/chrome_proxy_top_20_000.wpr.sha1 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/run_tests
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index ed1429cb7f9b5c84b51df529558b6d9010d1ab89..3cc6b94c74a7cd2faa15bf4f71cb19a43aeccdef 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -19,4 +19,14 @@ from telemetry.unittest import run_tests
if __name__ == '__main__':
base_dir = os.path.dirname(os.path.realpath(__file__))
run_tests.environment = run_tests.Environment(base_dir, [base_dir])
- sys.exit(run_tests.RunTestsCommand.main())
+ test_result = run_tests.RunTestsCommand.main()
+
+ # Continue with chrome_proxy tests which are under a different directory.
+ chrome_proxy_dir = os.path.realpath(
+ os.path.join(os.path.dirname(__file__), os.pardir, 'chrome_proxy'))
+ sys.path.append(chrome_proxy_dir)
+ run_tests.environment = run_tests.Environment(
+ chrome_proxy_dir, [chrome_proxy_dir])
+
+ test_result += run_tests.RunTestsCommand.main()
+ sys.exit(test_result)
tonyg 2014/07/17 18:27:52 If the benchmark is happy, then I'm happy with thi
dtu 2014/07/17 22:17:38 I think I'd prefer another run_tests or run_unitte
« no previous file with comments | « tools/perf/page_sets/data/chrome_proxy_top_20_000.wpr.sha1 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698