Changeset 127642 in webkit

Timestamp:

Sep 5, 2012 1:48:23 PM (12 years ago)

Author:

allan.jensen@nokia.com

Message:

Ignore-metrics includes scroll offsets.
​https://bugs.webkit.org/show_bug.cgi?id=95845

Reviewed by Dirk Pranke.

Strip scroll-offsets the same way scroll-height and scroll-width is stripped.

• Scripts/old-run-webkit-tests:

(stripMetrics):

• Scripts/webkitpy/layout_tests/port/driver.py:

(DriverOutput):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/old-run-webkit-tests (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/driver.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-05  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        Ignore-metrics includes scroll offsets.
+        https://bugs.webkit.org/show_bug.cgi?id=95845
+
+        Reviewed by Dirk Pranke.
+
+        Strip scroll-offsets the same way scroll-height and scroll-width is stripped.
+
+        * Scripts/old-run-webkit-tests:
+        (stripMetrics):
+        * Scripts/webkitpy/layout_tests/port/driver.py:
+        (DriverOutput):
+
 2012-09-05  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Tools/Scripts/old-run-webkit-tests

@@ -2463 +2463 @@
         $result =~ s/ *" *\n +" */ /g;
         $result =~ s/" +$/"/g;
-
         $result =~ s/- /-/g;
         $result =~ s/\n( *)"\s+/\n$1"/g;
@@ -2469 +2468 @@
         $result =~ s/scrollWidth [0-9]+/scrollWidth/g;
         $result =~ s/scrollHeight [0-9]+/scrollHeight/g;
+        $result =~ s/scrollX [0-9]+/scrollX/g;
+        $result =~ s/scrollY [0-9]+/scrollY/g;
+        $result =~ s/scrolled to [0-9]+,[0-9]+/scrolled/g;
     }
 

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

@@ -67 +67 @@
     strip_patterns.append((re.compile('" +$'), '"'))
     strip_patterns.append((re.compile('- '), '-'))
+    strip_patterns.append((re.compile('\n( *)"\s+'), '\n\g<1>"'))
     strip_patterns.append((re.compile('\s+"\n'), '"\n'))
     strip_patterns.append((re.compile('scrollWidth [0-9]+'), 'scrollWidth'))
     strip_patterns.append((re.compile('scrollHeight [0-9]+'), 'scrollHeight'))
+    strip_patterns.append((re.compile('scrollX [0-9]+'), 'scrollX'))
+    strip_patterns.append((re.compile('scrollY [0-9]+'), 'scrollY'))
+    strip_patterns.append((re.compile('scrolled to [0-9]+,[0-9]+'), 'scrolled'))
 
     def __init__(self, text, image, image_hash, audio, crash=False,