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

Unified Diff: scripts/master/factory/chromium_factory.py

Issue 134723004: Prevent parallelization of ash browsertests on the same machine. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 6 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/master/factory/chromium_factory.py
diff --git a/scripts/master/factory/chromium_factory.py b/scripts/master/factory/chromium_factory.py
index cff6c1c9f7b40f197d485e816fe15b8d5c637524..4914dfa6c37c5d530381e146c9aa97dc7a53fe15 100644
--- a/scripts/master/factory/chromium_factory.py
+++ b/scripts/master/factory/chromium_factory.py
@@ -537,7 +537,10 @@ class ChromiumFactory(gclient_factory.GClientFactory):
f.AddBuildrunnerGTest('content_browsertests', fp)
if R('ash_browsertests'):
ash_fp = fp.copy()
- ash_fp['browser_tests_extra_options'] = ['--ash-browsertests']
+ # Ash browser tests use the Metro environment and thus cannot be ran in
+ # parallel on the same machine.
+ ash_fp['browser_tests_extra_options'] = ['--ash-browsertests',
+ '--test-launcher-jobs=1']
f.AddBuildrunnerBrowserTests(ash_fp)
# Big, UI tests:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698