WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.

scripts/slave/recipe_modules/webrtc/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.
 
+import ast
+import json
+
 from slave import recipe_api
 from slave.recipe_modules.webrtc import builders
 
 
 class WebRTCApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
     super(WebRTCApi, self).__init__(**kwargs)
     self._env = {}
 
   BUILDERS = builders.BUILDERS
@@ skipping 45 matching lines @@
     'android_apk_dbg_archive': 'gs://chromium-webrtc/android_dbg',
     'android_apk_rel_archive': 'gs://chromium-webrtc/android_rel',
     'win_rel_archive': 'gs://chromium-webrtc/Win Builder',
     'win_rel_archive_fyi': 'gs://chromium-webrtc/win_rel-fyi',
     'mac_rel_archive': 'gs://chromium-webrtc/Mac Builder',
     'linux_rel_archive': 'gs://chromium-webrtc/Linux Builder',
   }
 
   DASHBOARD_UPLOAD_URL = 'https://chromeperf.appspot.com'
 
-  def runtests(self, test_suite=None, revision=None):
+  def runtests(self, test_suite=None, revision=None, cr_revision=None):
     """Add a suite of test steps.
 
     Args:
       test_suite: The name of the test suite.
       revision: Revision for the build. Mandatory for perf measuring tests.
+      cr_revision: Chromium revision for the build, where applicable.
     """
     with self.m.step.defer_results():
       if test_suite in ('webrtc', 'webrtc_parallel'):
         parallel = test_suite.endswith('_parallel')
         for test in self.NORMAL_TESTS:
           self.add_test(test, parallel=parallel)
 
         if self.m.platform.is_mac and self.m.chromium.c.TARGET_BITS == 64:
           test = self.m.path.join('libjingle_peerconnection_objc_test.app',
                                   'Contents', 'MacOS',
@@ skipping 83 matching lines @@
     Notice that the name parameter should be the same as the test executable in
     order to get the stdio links in the perf dashboard to become correct.
     """
     name = name or test
     args = args or []
     env = env or {}
     if self.c.PERF_ID and perf_test:
       perf_dashboard_id = perf_dashboard_id or test
       assert revision, ('Revision must be specified for perf tests as they '
                         'upload data to the perf dashboard.')
+      # Ensure we get the WebRTC revision passed as well for bots that builds
+      # WebRTC ToT in a Chromium checkout.
+      perf_config = self.c.PERF_CONFIG
+      if perf_config and cr_revision:
+        perf_config_dict = ast.literal_eval(self.c.PERF_CONFIG)
+        perf_config_dict['r_webrtc_rev'] = str(revision)
+        perf_config = json.dumps(perf_config_dict)
       self.m.chromium.runtest(
           test=test, args=args, name=name,
           results_url=self.DASHBOARD_UPLOAD_URL, annotate='graphing',
           xvfb=True, perf_dashboard_id=perf_dashboard_id, test_type=test,
           env=env, revision=revision, perf_id=self.c.PERF_ID,
-          perf_config=self.c.PERF_CONFIG)
+          perf_config=perf_config)
     else:
       annotate = 'gtest'
       python_mode = False
       test_type = test
       if parallel:
         test_executable = self.m.chromium.c.build_dir.join(
           self.m.chromium.c.build_config_fs, test)
         args = [test_executable] + args
         test = self.m.path['checkout'].join('third_party', 'gtest-parallel',
                                             'gtest-parallel')
@@ skipping 66 matching lines @@
     if self.m.chromium.c.TARGET_PLATFORM == 'android':
       self.m.chromium_android.clean_local_files()
     else:
       self.m.chromium.cleanup_temp()
 
   def virtual_webcam_check(self):
     self.m.python(
       'webcam_check',
       self.m.path['build'].join('scripts', 'slave', 'webrtc',
                                 'ensure_webcam_is_running.py'))