Point nacl tests to correct browser on 64-bit Windows

scripts/slave/recipe_modules/chromium/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from slave import recipe_api
 from slave import recipe_util
 
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.Placeholder):
   def __init__(self, api, tests):
@@ skipping 198 matching lines @@
         generate_json_file=True,
         results_directory=results_directory,
         python_mode=True,
         spawn_dbus=spawn_dbus,
         revision=revision,
         webkit_revision=webkit_revision,
         master_class_name=master_class_name,
         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 telemetry tests need
release_x64 while nacl needs Release_x64.

         annotate='gtest',
         name='telemetry_unittests',
         test_type='telemetry_unittests',
         python_mode=True,
         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',
         python_mode=True,
         xvfb=True)
 
   def runhooks(self, run_gyp=True, **kwargs):
     """Run the build-configuration hooks for chromium."""
     env = kwargs.get('env', {})
     if run_gyp:
@@ skipping 77 matching lines @@
               '--json', self.m.json.output()],
         step_test_data=lambda: self.m.json.test_api.output([]),
         **kwargs)
 
   def deps2submodules(self, **kwargs):
     return self.m.python(
         'deps2submodules',
         self.m.path['checkout'].join('tools', 'deps2git', 'deps2submodules.py'),
         args=['--gitless', self.m.path['checkout'].join('.DEPS.git')],
         **kwargs)