Changeset 129804 in webkit

Timestamp:

Sep 27, 2012 2:55:47 PM (12 years ago)

Author:

fmalita@chromium.org

Message:

[Perftest] PerfTestRunner exception when using nested git checkouts
​https://bugs.webkit.org/show_bug.cgi?id=97796

Reviewed by Ryosuke Niwa.

In order to support separate Chromium vs. WebKit git trees, PerfTestsRunner needs to
instantiate per-repository SCM objects when collecting revision information.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._generate_results_dict):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-27  Florin Malita  <fmalita@chromium.org>
+
+        [Perftest] PerfTestRunner exception when using nested git checkouts
+        https://bugs.webkit.org/show_bug.cgi?id=97796
+
+        Reviewed by Ryosuke Niwa.
+
+        In order to support separate Chromium vs. WebKit git trees, PerfTestsRunner needs to
+        instantiate per-repository SCM objects when collecting revision information.
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner._generate_results_dict):
+
 2012-09-27  Sudarsana Nagineni  <sudarsana.nagineni@intel.com>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -37 +37 @@
 
 from webkitpy.common import find_files
+from webkitpy.common.checkout.scm.detection import SCMDetector
 from webkitpy.common.host import Host
 from webkitpy.common.net.file_uploader import FileUploader
@@ -206 +207 @@
             contents['description'] = description
         for (name, path) in self._port.repository_paths():
-            contents[name + '-revision'] = self._host.scm().svn_revision(path)
+            scm = SCMDetector(self._host.filesystem, self._host.executive).detect_scm_system(path) or self._host.scm()
+            contents[name + '-revision'] = scm.svn_revision(path)
 
         # FIXME: Add --branch or auto-detect the branch we're in