diff options
Diffstat (limited to 'Tools/BuildSlaveSupport')
5 files changed, 67 insertions, 23 deletions
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json index 28ff304..b4a43d0 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -55,7 +55,7 @@ { "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" }, + { "name": "google-new-tests", "platform": "mac-snowleopard" }, { "name": "wincairo-1", "platform": "wincairo" }, @@ -101,6 +101,11 @@ "slavenames": ["apple-xserve-7", "test-slave"] }, { + "name": "SnowLeopard Intel Release (NRWT)", "type": "NewBuildAndTest", "builddir": "google-new-tests", + "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"], + "slavenames": ["google-new-tests"] + }, + { "name": "Windows Release (Build)", "type": "Build", "builddir": "win-release", "platform": "win", "configuration": "release", "architectures": ["i386"], "triggers": ["win-release-tests", "win-release-tests-wk2"], @@ -197,11 +202,6 @@ "slavenames": ["google-linux-2"] }, { - "name": "New run-webkit-tests", "type": "NewBuildAndTest", "builddir": "google-new-tests", - "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"], - "slavenames": ["google-new-tests"] - }, - { "name": "WinCairo Debug (Build)", "type": "Build", "builddir": "win-cairo-debug", "platform": "wincairo", "configuration": "debug", "architectures": ["i386"], "slavenames": ["wincairo-1"] @@ -230,7 +230,7 @@ "builderNames": ["Leopard Intel Release (Build)", "Leopard Intel Debug (Build)"] }, { "type": "PlatformSpecificScheduler", "platform": "mac-snowleopard", "branch": "trunk", "treeStableTimer": 45.0, - "builderNames": ["SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks"] + "builderNames": ["SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks", "SnowLeopard Intel Release (NRWT)"] }, { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0, "builderNames": ["Windows Release (Build)", "Windows Debug (Build)"] diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 1beee38..61d0b42 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -18,6 +18,7 @@ from twisted.internet import defer import os import re import simplejson +import urllib from webkitpy.common.config import build as wkbuild from webkitpy.common.net.buildbot import BuildBot as wkbuildbot @@ -403,20 +404,32 @@ class UploadTestResults(transfer.FileUpload): class ExtractTestResults(master.MasterShellCommand): zipFile = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip") resultDirectory = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s)") + descriptionDone = ["uploaded results"] def __init__(self): master.MasterShellCommand.__init__(self, "") + def resultDirectoryURL(self): + return self.build.getProperties().render(self.resultDirectory).replace("public_html/", "/") + "/" + def start(self): self.command = ["ditto", "-k", "-x", "-V", self.build.getProperties().render(self.zipFile), self.build.getProperties().render(self.resultDirectory)] return master.MasterShellCommand.start(self) - def finished(self, result): - url = self.build.getProperties().render(self.resultDirectory).replace("public_html/", "/") + def addCustomURLs(self): + url = self.resultDirectoryURL() + "results.html" self.addURL("view results", url) - result = master.MasterShellCommand.finished(self, result) - self.step_status.setText(["uploaded results"]) - return result + + def finished(self, result): + self.addCustomURLs() + return master.MasterShellCommand.finished(self, result) + + +class ExtractTestResultsAndLeaks(ExtractTestResults): + def addCustomURLs(self): + ExtractTestResults.addCustomURLs(self) + url = "/LeaksViewer/?url=" + urllib.quote(self.resultDirectoryURL(), safe="") + self.addURL("view leaks", url) class Factory(factory.BuildFactory): @@ -442,6 +455,7 @@ class BuildFactory(Factory): class TestFactory(Factory): TestClass = RunWebKitTests + ExtractTestResultsClass = ExtractTestResults def __init__(self, platform, configuration, architectures): Factory.__init__(self, platform, configuration, architectures, False) self.addStep(DownloadBuiltProduct) @@ -455,10 +469,11 @@ class TestFactory(Factory): self.addStep(RunPerlTests) self.addStep(ArchiveTestResults) self.addStep(UploadTestResults) - self.addStep(ExtractTestResults) + self.addStep(self.ExtractTestResultsClass) class BuildAndTestFactory(Factory): TestClass = RunWebKitTests + ExtractTestResultsClass = ExtractTestResults def __init__(self, platform, configuration, architectures): Factory.__init__(self, platform, configuration, architectures, False) if platform.startswith("chromium"): @@ -481,7 +496,7 @@ class BuildAndTestFactory(Factory): self.addStep(RunPerlTests) self.addStep(ArchiveTestResults) self.addStep(UploadTestResults) - self.addStep(ExtractTestResults) + self.addStep(self.ExtractTestResultsClass) if platform == "gtk": self.addStep(RunGtkAPITests) if platform == "qt": @@ -489,6 +504,7 @@ class BuildAndTestFactory(Factory): class BuildAndTestLeaksFactory(BuildAndTestFactory): TestClass = RunWebKitLeakTests + ExtractTestResultsClass = ExtractTestResultsAndLeaks class NewBuildAndTestFactory(BuildAndTestFactory): TestClass = NewRunWebKitTests diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js index c15aef2..c847c73 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js @@ -39,7 +39,7 @@ RecentBuildsLoader.prototype = { var build = data[buildNumber]; var buildInfo = { - revision: build.sourceStamp.changes[0].rev, + revision: parseInt(build.properties.first(function(property) { return property[0] === "got_revision"; })[1], 10), leakCount: 0, url: null, }; @@ -61,7 +61,8 @@ RecentBuildsLoader.prototype = { return; if (!("view results" in step.urls)) return; - buildInfo.url = self._buildbotBaseURL + step.urls["view results"] + "/"; + var url = step.urls["view results"]; + buildInfo.url = self._buildbotBaseURL + url.replace(/\/results\.html$/, "") + "/"; } if (buildInfo.leakCount && buildInfo.url) { diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/Utilities.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/Utilities.js index c44848a..b1fd2b4 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/Utilities.js +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/Utilities.js @@ -40,3 +40,11 @@ function range(n) { result[i] = i; return result; } + +Array.prototype.first = function(predicate) { + for (var i = 0; i < this.length; ++i) { + if (predicate(this[i])) + return this[i]; + } + return null; +} diff --git a/Tools/BuildSlaveSupport/win/kill-old-processes b/Tools/BuildSlaveSupport/win/kill-old-processes index f7f4423..d04b990 100755 --- a/Tools/BuildSlaveSupport/win/kill-old-processes +++ b/Tools/BuildSlaveSupport/win/kill-old-processes @@ -26,14 +26,33 @@ import os, sys
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",
- "wdiff.exe", "LightTPD.exe"]
-
+ tasksToKill = [ "cl.exe",
+ "devenv.com",
+ "devenv.exe",
+ "DumpRenderTree.exe",
+ "DumpRenderTree_debug.exe",
+ "httpd.exe",
+ "imagediff.exe",
+ "imagediff_debug.exe",
+ "jsc.exe",
+ "jsc_debug.exe",
+ "LightTPD.exe",
+ "link.exe",
+ "midl.exe",
+ "perl.exe",
+ "Safari.exe",
+ "svn.exe",
+ "testapi.exe",
+ "testapi_debug.exe",
+ "VcBuildHelper.exe",
+ "wdiff.exe",
+ "WebKit2WebProcess.exe",
+ "WebKit2WebProcess_debug.exe",
+ "WebKitTestRunner.exe",
+ "WebKitTestRunner_debug.exe"]
+
for task in tasksToKill:
- os.system("taskkill /f /im " + task)
+ os.system("taskkill /t /f /im " + task)
if __name__ == '__main__':
sys.exit(main())
|