Changeset 91059 in webkit

Timestamp:

Jul 15, 2011 1:22:23 AM (13 years ago)

Author:

abarth@webkit.org

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-15  Adam Barth  <abarth@webkit.org>
+
+        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  <ojan@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -210 +210 @@
     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

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -604 +604 @@
 
     @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):