Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

6 files changed, 25 insertions, 8 deletions

diff --git a/Tools/Scripts/webkitpy/common/net/bugzilla/bug.py b/Tools/Scripts/webkitpy/common/net/bugzilla/bug.py
index af258eb..a751a7e 100644
--- a/Tools/Scripts/webkitpy/common/net/bugzilla/bug.py
+++ b/Tools/Scripts/webkitpy/common/net/bugzilla/bug.py
@@ -44,6 +44,7 @@ class Bug(object):
         return self.bug_dictionary["id"]
 
     def title(self):
+        # FIXME: Do we need to HTML unescape the title?
         return self.bug_dictionary["title"]
 
     def reporter_email(self):
diff --git a/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py b/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py
index 76cd31d..9dd165c 100644
--- a/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py
+++ b/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py
@@ -268,8 +268,9 @@ class BuildBot(object):
             "SnowLeopard.*Build",
             "SnowLeopard.*\(Test",
             "SnowLeopard.*\(WebKit2 Test",
-            "Leopard",
+            "Leopard.*Release",
             "Windows.*Build",
+            "WinCE",
             "EFL",
             "GTK.*32",
             "GTK.*64.*Debug",  # Disallow the 64-bit Release bot which is broken.
diff --git a/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py b/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py
index f158827..6addb56 100644
--- a/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py
@@ -240,7 +240,6 @@ class BuildBotTest(unittest.TestCase):
             {'name': u'GTK Linux 64-bit Release', },
             {'name': u'Qt Linux Release', },
             {'name': u'Qt Linux Release minimal', },
-            {'name': u'Qt Linux ARMv5 Release', },
             {'name': u'Qt Linux ARMv7 Release', },
             {'name': u'Qt Windows 32-bit Release', },
             {'name': u'Qt Windows 32-bit Debug', },
@@ -256,8 +255,9 @@ class BuildBotTest(unittest.TestCase):
             "SnowLeopard.*Build",
             "SnowLeopard.*\(Test",
             "SnowLeopard.*\(WebKit2 Test",
-            "Leopard",
+            "Leopard.*Release",
             "Windows.*Build",
+            "WinCE",
             "EFL",
             "GTK.*32",
             "GTK.*64.*Debug",  # Disallow the 64-bit Release bot which is broken.
@@ -267,8 +267,6 @@ class BuildBotTest(unittest.TestCase):
         expected_builders = [
             {'name': u'Leopard Intel Release (Build)', },
             {'name': u'Leopard Intel Release (Tests)', },
-            {'name': u'Leopard Intel Debug (Build)', },
-            {'name': u'Leopard Intel Debug (Tests)', },
             {'name': u'SnowLeopard Intel Release (Build)', },
             {'name': u'SnowLeopard Intel Release (Tests)', },
             {'name': u'SnowLeopard Intel Release (WebKit2 Tests)', },
@@ -279,7 +277,6 @@ class BuildBotTest(unittest.TestCase):
             {'name': u'GTK Linux 64-bit Debug', },
             {'name': u'Qt Linux Release', },
             {'name': u'Qt Linux Release minimal', },
-            {'name': u'Qt Linux ARMv5 Release', },
             {'name': u'Qt Linux ARMv7 Release', },
             {'name': u'Qt Windows 32-bit Release', },
             {'name': u'Qt Windows 32-bit Debug', },
diff --git a/Tools/Scripts/webkitpy/common/net/testoutput.py b/Tools/Scripts/webkitpy/common/net/testoutput.py
index 37c1445..7e181ed 100644
--- a/Tools/Scripts/webkitpy/common/net/testoutput.py
+++ b/Tools/Scripts/webkitpy/common/net/testoutput.py
@@ -48,13 +48,13 @@ class TestOutput(object):
 
     def _extract_platform(self, filename):
         """Calculates the platform from the name of the file if it isn't known already"""
-        path = re.split(os.path.sep, filename)
+        path = filename.split(os.path.sep)
         if 'platform' in path:
             return path[path.index('platform') + 1]
         return None
 
     def _extract_test_name(self, filename):
-        path = re.split(os.path.sep, filename)
+        path = filename.split(os.path.sep)
         if 'LayoutTests' in path:
             path = path[1 + path.index('LayoutTests'):]
         if 'layout-test-results' in path:
diff --git a/Tools/Scripts/webkitpy/common/net/testoutput_unittest.py b/Tools/Scripts/webkitpy/common/net/testoutput_unittest.py
index ad38ca6..6b820c6 100644
--- a/Tools/Scripts/webkitpy/common/net/testoutput_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/testoutput_unittest.py
@@ -22,7 +22,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
 import re
+import sys
 import testoutput
 import unittest
 
@@ -60,10 +62,19 @@ class FakeTestOutput(testoutput.TestOutput):
 
 class TestOutputTest(unittest.TestCase):
     def _check_name(self, filename, expected_test_name):
+        # FIXME: should consider using MockFileSystem here so as to not
+        # have to worry about platform-specific path separators.
+        if sys.platform == 'win32':
+            filename = filename.replace('/', os.path.sep)
+            expected_test_name = expected_test_name.replace('/', os.path.sep)
         r = testoutput.TextTestOutput(None, FakeFile(filename))
         self.assertEquals(expected_test_name, r.name())
 
     def _check_platform(self, filename, expected_platform):
+        # FIXME: should consider using MockFileSystem here so as to not
+        # have to worry about platform-specific path separators.
+        if sys.platform == 'win32':
+            filename = filename.replace('/', os.path.sep)
         r = testoutput.TextTestOutput(None, FakeFile(filename))
         self.assertEquals(expected_platform, r.platform())
 
diff --git a/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py b/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py
index a70a539..f33850c 100644
--- a/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py
@@ -22,6 +22,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import sys
+
 from webkitpy.common.system.zip_mock import MockZip
 import testoutputset
 import unittest
@@ -72,6 +74,11 @@ class TestOutputSetTest(unittest.TestCase):
         self.assertEquals(2, len(b.outputs_for('fast/dom/test')))
 
     def test_can_infer_platform_from_path_if_none_provided(self):
+        # FIXME: unclear what the right behavior on win32 is.
+        # https://bugs.webkit.org/show_bug.cgi?id=54525.
+        if sys.platform == 'win32':
+            return
+
         zip = MockZip()
         zip.insert('platform/win/some-test-expected.png', '<image data>')
         zip.insert('platform/win/some-test-expected.checksum', 'abc123')