diff options
Diffstat (limited to 'Tools/BuildSlaveSupport')
5 files changed, 18 insertions, 9 deletions
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json index c4f98ae69..d6f12ccfe 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -51,7 +51,7 @@ { "name": "szeged-windows-1", "platform": "qt-win"}, { "name": "szeged-windows-2", "platform": "qt-win"}, - { "name": "indt-snowleopard", "platform": "qt-mac"}, + { "name": "indt-mountainlion", "platform": "qt-mac"}, { "name": "google-windows-1", "platform": "chromium-win" }, { "name": "google-windows-2", "platform": "chromium-win" }, @@ -233,9 +233,9 @@ "slavenames": ["szeged-windows-2"] }, { - "name": "Qt SnowLeopard Release", "type": "Build", "builddir": "qt-snowleopard-release", + "name": "Qt Mountain Lion Release", "type": "Build", "builddir": "qt-mountainlion-release", "platform": "qt-mac", "configuration": "release", "architectures": ["x86_64"], - "slavenames": ["indt-snowleopard"] + "slavenames": ["indt-mountainlion"] }, { "name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release", @@ -326,7 +326,7 @@ "builderNames": ["GTK Linux 32-bit Release", "GTK Linux 64-bit Release", "GTK Linux 64-bit Debug", "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux 64-bit Release (Perf)", "Qt Linux 64-bit Release (WebKit2 Perf)", "Qt Linux ARMv7 Release", - "Qt Windows 32-bit Release", "Qt Windows 32-bit Debug", "Qt SnowLeopard Release", + "Qt Windows 32-bit Release", "Qt Windows 32-bit Debug", "Qt Mountain Lion Release", "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release", "Chromium Android Release", "EFL Linux 64-bit Release", "EFL Linux 64-bit Debug", "EFL Linux 32-bit Release (Build)", "EFL Linux 64-bit Debug WK2", diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 546844b38..363e8921a 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -107,6 +107,7 @@ class ConfigureBuild(buildstep.BuildStep): self.setProperty("configuration", self.configuration) self.setProperty("architecture", self.architecture) self.setProperty("buildOnly", self.buildOnly) + self.setProperty("shouldAbortEarly", True) self.finished(SUCCESS) return defer.succeed(None) @@ -298,9 +299,7 @@ class RunWebKitTests(shell.Test): "--build-number", WithProperties("%(buildnumber)s"), "--master-name", "webkit.org", "--test-results-server", "test-results.appspot.com", - WithProperties("--%(configuration)s"), - "--exit-after-n-crashes-or-timeouts", "20", - "--exit-after-n-failures", "500"] + WithProperties("--%(configuration)s")] def __init__(self, buildJSCTool=True, *args, **kwargs): self.buildJSCTool = buildJSCTool @@ -309,9 +308,13 @@ class RunWebKitTests(shell.Test): def start(self): platform = self.getProperty('platform') + shouldAbortEarly = self.getProperty('shouldAbortEarly') appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform')) if platform.startswith('mac'): self.setCommand(self.command + ['--no-build']) + if shouldAbortEarly: + self.setCommand(self.command + ["--exit-after-n-crashes-or-timeouts", "20", "--exit-after-n-failures", "500"]) + if platform == "win": rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")] self.setCommand(self.command + ['--no-build']) @@ -351,7 +354,7 @@ class RunWebKitTests(shell.Test): expressions = [ ('flakes', re.compile(r'[Uu]nexpected flakiness.+:?\s*\((\d+)\)')), ('new passes', re.compile(r'Expected to .+, but passed:\s+\((\d+)\)')), - ('missing results', re.compile(r'(no expected results found|missing results)\s*:\s+\((\d+)\)')), + ('missing results', re.compile(r'(?:no expected results found|missing results)\s*:\s+\((\d+)\)')), ('failures', re.compile(r'Regressions: [Uu]nexpected.+:?\s*\((\d+)\)')), ] testFailures = {} @@ -596,6 +599,7 @@ class RunWebKitLeakTests(RunWebKitTests): class RunWebKit2Tests(RunWebKitTests): def start(self): + self.setProperty("shouldAbortEarly", False) self.setCommand(self.command + ["--webkit-test-runner"]) return RunWebKitTests.start(self) diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py b/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py index 813ff22d6..857344005 100755 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py @@ -5,6 +5,10 @@ import os import StringIO import unittest +# Show DepricationWarnings come from buildbot - it isn't default with Python 2.7 or newer. +# See https://bugs.webkit.org/show_bug.cgi?id=90161 for details. +import warnings +warnings.simplefilter('default') class BuildBotConfigLoader(object): def _add_webkitpy_to_sys_path(self): diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html b/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html index 0180eab0c..467f24016 100755 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html @@ -24,6 +24,7 @@ <li><a href="results">Test Results</a></li> <li><a href="LeaksViewer">Leaks Viewer</a></li> <li><a href="TestFailures">Test Failures</a></li> + <li><a href="http://webkit-perf.appspot.com/">Perf-o-matic</a> (external website) results submitted by <a href="http://build.webkit.org/waterfall?show=Apple%20Lion%20Release%20%28Perf%29&show=Chromium%20Linux%20Release%20%28Perf%29&show=Chromium%20Mac%20Release%20%28Perf%29&show=Chromium%20Win%20Release%20%28Perf%29&show=Qt%20Linux%2064-bit%20Release%20%28Perf%29&show=Qt%20Linux%2064-bit%20Release%20%28WebKit2%20Perf%29">performance bots</a></li> </ul> </body> </html> diff --git a/Tools/BuildSlaveSupport/built-product-archive b/Tools/BuildSlaveSupport/built-product-archive index ac9ae3d50..6c4c8eede 100644 --- a/Tools/BuildSlaveSupport/built-product-archive +++ b/Tools/BuildSlaveSupport/built-product-archive @@ -145,7 +145,7 @@ def archiveBuiltProduct(configuration, platform, fullPlatform): if platform == 'qt' or platform == 'efl': neededDirectories = ["bin", "lib"] elif platform == 'gtk': - neededDirectories = ["Programs", ".libs", "Libraries"] + neededDirectories = ["Programs", ".libs", "Libraries", "TestNetscapePlugin"] for dirname in neededDirectories: fromDir = os.path.join(configurationBuildDirectory, dirname, ".") |