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

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

Issue 238953003: Point nacl tests to correct browser on 64-bit Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: fixes 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_trybot.py » ('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 b1aa98eb4d4b46aeaf9b29f5d3668abcb9f25e34..3be601c4354f311fc7f2c4600eb709b32623edca 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -216,12 +216,9 @@ 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' % browser],
+ args=['--browser=%s' % self.c.build_config_fs.lower()],
Michael Achenbach 2014/04/15 11:37:35 Assuming the following statement is correct: the t
annotate='gtest',
name='telemetry_unittests',
test_type='telemetry_unittests',
@@ -229,12 +226,9 @@ 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' % browser],
+ args=['--browser=%s' % self.c.build_config_fs.lower()],
annotate='gtest',
name='telemetry_perf_unittests',
test_type='telemetry_perf_unittests',
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium_trybot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698