diff options
Diffstat (limited to 'Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg')
| -rw-r--r-- | Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 30 |
1 files changed, 23 insertions, 7 deletions
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 |