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

Unified Diff: scripts/slave/recipe_modules/chromium/api.py

Issue 235423003: Point telemetry tests to correct browser on 64-bit Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 8 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 | scripts/slave/recipes/chromium.expected/full_chromium_win_Win_7_Tests_x64__3_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium/api.py
diff --git a/scripts/slave/recipe_modules/chromium/api.py b/scripts/slave/recipe_modules/chromium/api.py
index 228457af0a6a2069db78f59bba22aace447d7ea4..f91decd23be66bf82f26ec69c0a9c1359ed2668b 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -216,9 +216,12 @@ class ChromiumApi(recipe_api.RecipeApi):
env=env)
def run_telemetry_unittests(self):
+ browser = self.c.BUILD_CONFIG.lower()
+ if self.m.platform.is_win and self.c.TARGET_BITS == 64:
+ browser += '_x64'
return self.runtest(
self.m.path['checkout'].join('tools', 'telemetry', 'run_tests'),
- args=['--browser=%s' % self.c.BUILD_CONFIG.lower()],
+ args=['--browser=%s' % browser],
annotate='gtest',
name='telemetry_unittests',
test_type='telemetry_unittests',
@@ -226,9 +229,12 @@ class ChromiumApi(recipe_api.RecipeApi):
xvfb=True)
def run_telemetry_perf_unittests(self):
+ browser = self.c.BUILD_CONFIG.lower()
+ if self.m.platform.is_win and self.c.TARGET_BITS == 64:
+ browser += '_x64'
return self.runtest(
self.m.path['checkout'].join('tools', 'perf', 'run_tests'),
- args=['--browser=%s' % self.c.BUILD_CONFIG.lower()],
+ args=['--browser=%s' % browser],
annotate='gtest',
name='telemetry_perf_unittests',
test_type='telemetry_perf_unittests',
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.expected/full_chromium_win_Win_7_Tests_x64__3_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698