Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1

2 files changed, 23 insertions, 14 deletions

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
index 93f1c11..f4b0822 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -35,12 +35,12 @@
                     { "name": "szeged-windows-1", "platform": "qt"},
                     { "name": "szeged-windows-2", "platform": "qt"},
 
-                    { "name": "google-windows-1", "platform": "chromium" },
-                    { "name": "google-mac-1", "platform": "chromium" },
-                    { "name": "google-linux-1", "platform": "chromium" },
-                    { "name": "google-windows-2", "platform": "chromium" },
-                    { "name": "google-mac-2", "platform": "chromium" },
-                    { "name": "google-linux-2", "platform": "chromium" },
+                    { "name": "google-windows-1", "platform": "chromium-win" },
+                    { "name": "google-mac-1", "platform": "chromium-mac" },
+                    { "name": "google-linux-1", "platform": "chromium-linux" },
+                    { "name": "google-windows-2", "platform": "chromium-win" },
+                    { "name": "google-mac-2", "platform": "chromium-mac" },
+                    { "name": "google-linux-2", "platform": "chromium-linux" },
                     { "name": "google-new-tests", "platform": "mac-leopard" }
                   ],
 
@@ -150,32 +150,32 @@
                     },
                     {
                       "name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release",
-                      "platform": "chromium", "configuration": "release", "architectures": ["i386"],
+                      "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-windows-1"]
                     },
                     {
                       "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release",
-                      "platform": "chromium", "configuration": "release", "architectures": ["i386"],
+                      "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-mac-1"]
                     },
                     {
                       "name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release",
-                      "platform": "chromium", "configuration": "release", "architectures": ["i386"],
+                      "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-linux-1"]
                     },
                     {
                       "name": "Chromium Win Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-win-release-tests",
-                      "platform": "chromium", "configuration": "release", "architectures": ["i386"],
+                      "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-windows-2"]
                     },
                     {
                       "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-mac-release-tests",
-                      "platform": "chromium", "configuration": "release", "architectures": ["i386"],
+                      "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-mac-2"]
                     },
                     {
                       "name": "Chromium Linux Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-linux-release-tests",
-                      "platform": "chromium", "configuration": "release", "architectures": ["i386"],
+                      "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-linux-2"]
                     },
                     {
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index e1eaa71..5ff4681 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -68,6 +68,13 @@ class InstallChromiumDependencies(shell.ShellCommand):
     command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium", "--force"]
     haltOnFailure = True
 
+class CleanupChromiumLinuxCrashLogs(shell.ShellCommand):
+    name = "cleanup crash logs"
+    description = ["removing crash logs"]
+    descriptionDone = ["removed crash logs"]
+    command = ["sh", "-c", "rm -rf /tmp/.org.chromium.*"]
+    haltOnFailure = False
+
 
 def appendCustomBuildFlags(step, platform):
     if platform in ('gtk', 'wx', 'qt', 'chromium'):
@@ -343,7 +350,7 @@ class Factory(factory.BuildFactory):
         if platform == "win":
             self.addStep(KillOldProcesses)
             self.addStep(InstallWin32Dependencies)
-        if platform == "chromium":
+        if platform.startswith("chromium"):
             self.addStep(InstallChromiumDependencies)
 
 class BuildFactory(Factory):
@@ -375,8 +382,10 @@ class BuildAndTestFactory(Factory):
     TestClass = RunWebKitTests
     def __init__(self, platform, configuration, architectures):
         Factory.__init__(self, platform, configuration, architectures, False)
+        if platform == "chromium-linux":
+            self.addStep(CleanupChromiumLinuxCrashLogs)
         self.addStep(CompileWebKit)
-        if platform != "chromium":
+        if not platform.startswith("chromium"):
             self.addStep(RunJavaScriptCoreTests)
         self.addStep(self.TestClass)
         # Tiger's Python 2.3 is too old.  WebKit Python requires 2.5+.