Title: [91059] trunk/Tools
- Revision
- 91059
- Author
- [email protected]
- Date
- 2011-07-15 01:22:23 -0700 (Fri, 15 Jul 2011)
Log Message
NRWT stores the Chromium revision number in full_results.json
https://bugs.webkit.org/show_bug.cgi?id=64586
I have no earthly idea how to test this change.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
* Scripts/webkitpy/layout_tests/port/base.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91058 => 91059)
--- trunk/Tools/ChangeLog 2011-07-15 08:10:54 UTC (rev 91058)
+++ trunk/Tools/ChangeLog 2011-07-15 08:22:23 UTC (rev 91059)
@@ -1,3 +1,13 @@
+2011-07-15 Adam Barth <[email protected]>
+
+ NRWT stores the Chromium revision number in full_results.json
+ https://bugs.webkit.org/show_bug.cgi?id=64586
+
+ I have no earthly idea how to test this change.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ * Scripts/webkitpy/layout_tests/port/base.py:
+
2011-07-14 Ojan Vafai <[email protected]>
fix remaining style issues in the static-dashboards directory
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (91058 => 91059)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-07-15 08:10:54 UTC (rev 91058)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-07-15 08:22:23 UTC (rev 91059)
@@ -209,7 +209,7 @@
results['has_wdiff'] = port_obj.wdiff_available()
results['has_pretty_patch'] = port_obj.pretty_patch_available()
try:
- results['revision'] = port_obj.webkit_scm().head_svn_revision()
+ results['revision'] = port_obj.webkit_source_scm().head_svn_revision()
except Exception, e:
# FIXME: We would like to warn here, but that would cause all passing_run integration tests
# to fail, since they assert that we have no logging output.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (91058 => 91059)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-07-15 08:10:54 UTC (rev 91058)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-07-15 08:22:23 UTC (rev 91059)
@@ -603,12 +603,16 @@
return self._config.path_from_webkit_base(*comps)
@memoized
- def webkit_scm(self):
+ def webkit_source_scm(self):
# On the chromium bots, the cwd is the root of the chromium checkout.
# self._config.webkit_base_dir() knows where the webkit root is, no other
- # object in NRWT seems to keep an SCM around. (Unlike webkit-patch where it's on the Tool/Host object.)
+ # object in NRWT seems to keep an SCM around. (Unlike webkit-patch
+ # where it's on the Tool/Host object.)
# FIXME: We should be able to get the SCM from somewhere else.
- return detect_scm_system(self._config.webkit_base_dir())
+ # FIXME: Due to Chromium's insane DEPS system, the root of the WebKit
+ # checkout isn't actually from svn.webkit.org. Instead, we detect the
+ # scm from the Source directory, which really does map to svn.webkit.org.
+ return detect_scm_system(self.path_from_webkit_base('Source'))
def path_to_test_expectations_file(self):
"""Update the test expectations to the passed-in string.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
