summaryrefslogtreecommitdiffstats
path: root/Tools/BuildSlaveSupport
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/BuildSlaveSupport')
-rw-r--r--Tools/BuildSlaveSupport/build.webkit.org-config/config.json7
-rw-r--r--Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg23
-rwxr-xr-xTools/BuildSlaveSupport/chromium/remove-crash-logs41
-rwxr-xr-xTools/BuildSlaveSupport/win/kill-old-processes3
4 files changed, 58 insertions, 16 deletions
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
index 07edacc..09953ab 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -152,11 +152,6 @@
"slavenames": ["szeged-linux-2"]
},
{
- "name": "Qt Linux ARMv5 Release", "type": "Build", "builddir": "qt-linux-armv5-release",
- "platform": "qt", "configuration": "release", "architectures": ["armv5"],
- "slavenames": ["szeged-linux-3"]
- },
- {
"name": "Qt Linux ARMv7 Release", "type": "Build", "builddir": "qt-linux-armv7-release",
"platform": "qt", "configuration": "release", "architectures": ["armv7"],
"slavenames": ["szeged-linux-4"]
@@ -227,7 +222,7 @@
"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",
- "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux ARMv5 Release", "Qt Linux ARMv7 Release",
+ "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux ARMv7 Release",
"Qt Windows 32-bit Release", "Qt Windows 32-bit Debug",
"Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release",
"Chromium Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)",
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 4ee277c..7913095 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -72,11 +72,11 @@ class InstallChromiumDependencies(shell.ShellCommand):
command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"]
haltOnFailure = True
-class CleanupChromiumLinuxCrashLogs(shell.ShellCommand):
+class CleanupChromiumCrashLogs(shell.ShellCommand):
name = "cleanup crash logs"
description = ["removing crash logs"]
descriptionDone = ["removed crash logs"]
- command = ["sh", "-c", "rm -rf /tmp/.org.chromium.*"]
+ command = ["python", "./Tools/BuildSlaveSupport/chromium/remove-crash-logs"]
haltOnFailure = False
@@ -420,8 +420,9 @@ class Factory(factory.BuildFactory):
factory.BuildFactory.__init__(self)
self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly)
self.addStep(CheckOutSource)
- if platform == "win":
+ if platform in ("win", "chromium-win"):
self.addStep(KillOldProcesses)
+ if platform == "win":
self.addStep(InstallWin32Dependencies)
if platform.startswith("chromium"):
self.addStep(InstallChromiumDependencies)
@@ -445,10 +446,9 @@ 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" and platform != "chromium-win":
+ if platform != "mac-tiger":
self.addStep(RunPythonTests)
- if platform != "chromium-win":
- self.addStep(RunPerlTests)
+ self.addStep(RunPerlTests)
self.addStep(ArchiveTestResults)
self.addStep(UploadTestResults)
self.addStep(ExtractTestResults)
@@ -457,8 +457,8 @@ 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)
+ if platform.startswith("chromium"):
+ self.addStep(CleanupChromiumCrashLogs)
self.addStep(CompileWebKit)
if not platform.startswith("chromium"):
self.addStep(RunJavaScriptCoreTests)
@@ -467,9 +467,14 @@ class BuildAndTestFactory(Factory):
self.addStep(self.TestClass)
# 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.
+ # Chromium Win runs in non-Cygwin environment, which is not yet fit
+ # for running tests. This can be removed once bug 48166 is fixed.
if platform != "mac-tiger":
self.addStep(RunPythonTests)
- self.addStep(RunPerlTests)
+ # Chromium Win runs in non-Cygwin environment, which is not yet fit
+ # for running tests. This can be removed once bug 48166 is fixed.
+ if platform != "chromium-win":
+ self.addStep(RunPerlTests)
self.addStep(ArchiveTestResults)
self.addStep(UploadTestResults)
self.addStep(ExtractTestResults)
diff --git a/Tools/BuildSlaveSupport/chromium/remove-crash-logs b/Tools/BuildSlaveSupport/chromium/remove-crash-logs
new file mode 100755
index 0000000..4f999c4
--- /dev/null
+++ b/Tools/BuildSlaveSupport/chromium/remove-crash-logs
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# Copyright (c) 2011 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (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 sys
+
+if __name__ == '__main__':
+ if sys.platform == 'linux2':
+ os.system('rm -rf /tmp/.org.chromium.*')
+ elif sys.platform == 'darwin':
+ import Foundation
+ os.system('rm -rf %s' % os.path.join(Foundation.NSTemporaryDirectory(),
+ '.org.chromium.*'))
+ elif 'win' in sys.platform:
+ os.system('for /d %d in (%TEMP%\scoped_dir*) do rd /s /q "%d"')
diff --git a/Tools/BuildSlaveSupport/win/kill-old-processes b/Tools/BuildSlaveSupport/win/kill-old-processes
index 6760e08..885d6fa 100755
--- a/Tools/BuildSlaveSupport/win/kill-old-processes
+++ b/Tools/BuildSlaveSupport/win/kill-old-processes
@@ -29,7 +29,8 @@ def main():
tasksToKill = ["DumpRenderTree.exe", "DumpRenderTree_debug.exe", "testapi.exe", "testapi_debug.exe",
"svn.exe", "httpd.exe", "cl.exe", "link.exe", "midl.exe", "devenv.exe", "perl.exe",
"imagediff.exe", "imagediff_debug.exe", "jsc.exe", "jsc_debug.exe", "WebKit2WebProcess.exe",
- "WebKit2WebProcess_debug.exe", "WebKitTestRunner.exe", "WebKitTestRunner_debug.exe"]
+ "WebKit2WebProcess_debug.exe", "WebKitTestRunner.exe", "WebKitTestRunner_debug.exe",
+ "wdiff.exe"]
for task in tasksToKill:
os.system("taskkill /f /im " + task)
generated by cgit v1.1 at 2025-08-15 14:29:50 +0000