Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

4 files changed, 13 insertions, 16 deletions

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
index 6e03f7a..07edacc 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -17,7 +17,9 @@
                     { "name": "apple-macpro-3", "platform": "mac-snowleopard" },
                     { "name": "apple-macpro-4", "platform": "mac-leopard" },
                     { "name": "apple-macpro-5", "platform": "mac-leopard" },	
-                    { "name": "apple-macpro-6", "platform": "mac-leopard" },	
+                    { "name": "apple-macpro-6", "platform": "mac-leopard" },
+                    { "name": "apple-macpro-7", "platform": "mac-leopard" },	
+                    	
 
                     { "name": "apple-windows-1", "platform": "win"},
                     { "name": "apple-windows-2", "platform": "win"},
@@ -38,7 +40,6 @@
                     { "name": "gtk-linux-slave-1", "platform": "gtk"},
                     { "name": "gtk-linux-slave-2", "platform": "gtk"},
                     { "name": "gtk-linux-slave-3", "platform": "gtk"},
-                    { "name": "gtk-linux-slave-4", "platform": "gtk"},
 
                     { "name": "szeged-linux-1", "platform": "qt"},
                     { "name": "szeged-linux-2", "platform": "qt"},
@@ -70,7 +71,7 @@
                     },
                     { "name": "Leopard Intel Release (Tests)", "type": "Test", "builddir": "leopard-intel-release-tests",
                       "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"],
-                      "slavenames": ["apple-macpro-4", "apple-pixel-1", "test-slave"]
+                      "slavenames": ["apple-macpro-4", "apple-pixel-1", "test-slave", "apple-macpro-7"]
                     },
 
                     { "name": "Leopard Intel Debug (Build)", "type": "Build", "builddir": "leopard-intel-debug",
@@ -80,7 +81,7 @@
                     },
                     { "name": "Leopard Intel Debug (Tests)", "type": "Test", "builddir": "leopard-intel-debug-tests",
                       "platform": "mac-leopard", "configuration": "debug", "architectures": ["i386"],
-                      "slavenames": ["apple-xserve-3", "test-slave", "apple-macpro-5", "apple-macpro-6"]
+                      "slavenames": ["apple-xserve-3", "test-slave", "apple-macpro-5", "apple-macpro-6", "apple-macpro-7"]
                     },
                     { "name": "SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "snowleopard-intel-release",
                       "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"],
@@ -141,11 +142,6 @@
                       "slavenames": ["gtk-linux-slave-3"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release", "type": "BuildAndTest", "builddir": "gtk-linux-64-release",
-                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
-                      "slavenames": ["gtk-linux-slave-4"]
-                    },
-                    {
                       "name": "Qt Linux Release", "type": "BuildAndTest", "builddir": "qt-linux-release",
                       "platform": "qt", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["szeged-linux-1"]
@@ -230,7 +226,7 @@
     "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0,
                       "builderNames": ["Leopard Intel Release (Build)", "Leopard Intel Debug (Build)",
                                        "SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks",
-                                       "GTK Linux 32-bit Release", "GTK Linux 32-bit Debug", "GTK Linux 64-bit Debug", "GTK Linux 64-bit Release",
+                                       "GTK Linux 32-bit Release", "GTK Linux 32-bit Debug", "GTK Linux 64-bit Debug",
                                        "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux ARMv5 Release", "Qt Linux ARMv7 Release", 
                                        "Qt Windows 32-bit Release", "Qt Windows 32-bit Debug",
                                        "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release",
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 1ce5b88..4ee277c 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -318,8 +318,8 @@ class RunQtAPITests(shell.Test):
     description = ["API tests running"]
     descriptionDone = ["API tests"]
     command = ["python", "./Tools/Scripts/run-qtwebkit-tests",
-               "--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=30",
-               WithProperties("WebKitBuild/%(configuration_pretty)s/Source/WebKit/qt/tests/")]
+               "--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=120",
+               WithProperties("WebKitBuild/%(configuration_pretty)s/WebKit/qt/tests/")]
 
     def start(self):
         self.setProperty("configuration_pretty", self.getProperty("configuration").title())
@@ -445,9 +445,10 @@ class TestFactory(Factory):
         self.addStep(self.TestClass, skipBuild=(platform == 'win'))
         # Tiger's Python 2.3 is too old.  WebKit Python requires 2.5+.
         # Sadly we have no way to detect the version on the slave from here.
-        if platform != "mac-tiger":
+        if platform != "mac-tiger" and platform != "chromium-win":
             self.addStep(RunPythonTests)
-        self.addStep(RunPerlTests)
+        if platform != "chromium-win":
+            self.addStep(RunPerlTests)
         self.addStep(ArchiveTestResults)
         self.addStep(UploadTestResults)
         self.addStep(ExtractTestResults)
diff --git a/Tools/BuildSlaveSupport/built-product-archive b/Tools/BuildSlaveSupport/built-product-archive
index 611d006..9dee922 100644
--- a/Tools/BuildSlaveSupport/built-product-archive
+++ b/Tools/BuildSlaveSupport/built-product-archive
@@ -89,7 +89,7 @@ def archiveBuiltProduct(configuration, platform):
             shutil.rmtree(thinDirectory)
         os.mkdir(thinDirectory)
 
-        for dirname in ["bin", "lib", "Source/JavaScriptCore"]:
+        for dirname in ["bin", "lib", "JavaScriptCore"]:
             fromDir = os.path.join(configurationBuildDirectory, dirname, "*")
             toDir = os.path.join(thinDirectory, dirname)
             os.makedirs(toDir)
diff --git a/Tools/BuildSlaveSupport/test-result-archive b/Tools/BuildSlaveSupport/test-result-archive
index af66bf0..a4d3ca3 100644
--- a/Tools/BuildSlaveSupport/test-result-archive
+++ b/Tools/BuildSlaveSupport/test-result-archive
@@ -46,7 +46,7 @@ def main():
     if options.platform == 'chromium':
         # See results_directory() in webkitpy/layout_tests/port/chromium.py.
         layoutTestResultsDir = os.path.abspath(os.path.join(sourceRootDirectory,
-            "WebKit", "chromium", "webkit", options.configuration.capitalize(),
+            "Source", "WebKit", "chromium", "webkit", options.configuration.capitalize(),
             "layout-test-results"))
 
     return archiveTestResults(options.configuration, options.platform, layoutTestResultsDir)