Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Tools / Scripts / webkitpy / layout_tests / models / test_run_results.py

diff --git a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
index cd0ed51..1e729f8 100644 (file)
--- a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
+++ b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
@@ -28,6 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import logging
+import re
 import signal
 import time
 
@@ -163,6 +164,14 @@ def _interpret_test_failures(failures):
     return test_dict
 
 
+def _chromium_commit_position(scm, path):
+    log = scm.most_recent_log_matching('Cr-Commit-Position:', path)
+    match = re.search('^\s*Cr-Commit-Position:.*@\{#(?P<commit_position>\d+)\}', log, re.MULTILINE)
+    if not match:
+        return ""
+    return str(match.group('commit_position'))
+
+
 def summarize_results(port_obj, expectations, initial_results, retry_results, enabled_pixel_tests_in_retry, only_include_failing=False):
     """Returns a dictionary containing a summary of the test runs, with the following fields:
         'version': a version indicator
@@ -316,7 +325,10 @@ def summarize_results(port_obj, expectations, initial_results, retry_results, en
         for (name, path) in port_obj.repository_paths():
             scm = port_obj.host.scm_for_path(path)
             if scm:
-                rev = scm.svn_revision(path)
+                if name.lower() == 'chromium':
+                    rev = _chromium_commit_position(scm, path)
+                else:
+                    rev = scm.svn_revision(path)
             if rev:
                 results[name.lower() + '_revision'] = rev
             else: