Title: [129804] trunk/Tools
- Revision
- 129804
- Author
- fmal...@chromium.org
- Date
- 2012-09-27 14:55:47 -0700 (Thu, 27 Sep 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129803 => 129804)
--- trunk/Tools/ChangeLog 2012-09-27 21:54:20 UTC (rev 129803)
+++ trunk/Tools/ChangeLog 2012-09-27 21:55:47 UTC (rev 129804)
@@ -1,3 +1,16 @@
+2012-09-27 Florin Malita <fmal...@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.nagin...@intel.com>
[Mac][DRT] Add support to allow non-array modifier arguments in keyDown()
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (129803 => 129804)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2012-09-27 21:54:20 UTC (rev 129803)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2012-09-27 21:55:47 UTC (rev 129804)
@@ -36,6 +36,7 @@
import time
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
from webkitpy.performance_tests.perftest import PerfTestFactory
@@ -205,7 +206,8 @@
if description:
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
for key, value in {'timestamp': int(timestamp), 'branch': self._default_branch, 'platform': platform,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
