Changeset 83101 in webkit

Timestamp:

Apr 6, 2011 2:47:10 PM (13 years ago)

Author:

Adam Roben

Message:

Add a "view leaks" link to builds on SnowLeopard Intel Leaks

Fixes <​http://webkit.org/b/56032> Leaks viewer should be linked from leaks bot results page

Reviewed by David Kilzer.

• BuildSlaveSupport/build.webkit.org-config/master.cfg:

(ExtractTestResults.resultDirectoryURL): Added. Moved code to calculate the URL for the
build's results directory here...
(ExtractTestResults.finished): ...from here.
(ExtractTestResultsAndLeaks): New class that's used by the leaks builder
(ExtractTestResultsAndLeaks.finished): Calls up to the base class, but also adds a "view
leaks" link to point to Leaks Viewer for this build.
(TestFactory): Added ExtractTestResultsClass abstraction. This isn't overridden anywhere,
but it seemed good to add for consistency with BuildAndTestFactory.
(BuildAndTestFactory): Added ExtractTestResultsClass abstraction.
(BuildAndTestLeaksFactory): Use ExtractTestResultsAndLeaks as our ExtractTestResultsClass so
that we'll get a "view leaks" link.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (7 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -408 +408 @@
         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)]
@@ -413 +416 @@
 
     def finished(self, result):
-        url = self.build.getProperties().render(self.resultDirectory).replace("public_html/", "/") + "/results.html"
+        url = self.resultDirectoryURL() + "results.html"
         self.addURL("view results", url)
         result = master.MasterShellCommand.finished(self, result)
@@ -419 +422 @@
         return result
 
+class ExtractTestResultsAndLeaks(ExtractTestResults):
+    def finished(self, result):
+        result = ExtractTestResults.finished(self, result)
+        url = "/LeaksViewer/?url=" + urllib.quote(self.resultDirectoryURL(), safe="")
+        self.addURL("view leaks", url)
+        return result
 
 class Factory(factory.BuildFactory):
@@ -443 +452 @@
 class TestFactory(Factory):
     TestClass = RunWebKitTests
+    ExtractTestResultsClass = ExtractTestResults
     def __init__(self, platform, configuration, architectures):
         Factory.__init__(self, platform, configuration, architectures, False)
@@ -456 +466 @@
         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)
@@ -482 +493 @@
         self.addStep(ArchiveTestResults)
         self.addStep(UploadTestResults)
-        self.addStep(ExtractTestResults)
+        self.addStep(self.ExtractTestResultsClass)
         if platform == "gtk":
             self.addStep(RunGtkAPITests)
@@ -490 +501 @@
 class BuildAndTestLeaksFactory(BuildAndTestFactory):
     TestClass = RunWebKitLeakTests
+    ExtractTestResultsClass = ExtractTestResultsAndLeaks
 
 class NewBuildAndTestFactory(BuildAndTestFactory):

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-06  Adam Roben  <aroben@apple.com>
+
+        Add a "view leaks" link to builds on SnowLeopard Intel Leaks
+
+        Fixes <http://webkit.org/b/56032> Leaks viewer should be linked from leaks bot results page
+
+        Reviewed by David Kilzer.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (ExtractTestResults.resultDirectoryURL): Added. Moved code to calculate the URL for the
+        build's results directory here...
+        (ExtractTestResults.finished): ...from here.
+        (ExtractTestResultsAndLeaks): New class that's used by the leaks builder
+        (ExtractTestResultsAndLeaks.finished): Calls up to the base class, but also adds a "view
+        leaks" link to point to Leaks Viewer for this build.
+        (TestFactory): Added ExtractTestResultsClass abstraction. This isn't overridden anywhere,
+        but it seemed good to add for consistency with BuildAndTestFactory.
+        (BuildAndTestFactory): Added ExtractTestResultsClass abstraction.
+        (BuildAndTestLeaksFactory): Use ExtractTestResultsAndLeaks as our ExtractTestResultsClass so
+        that we'll get a "view leaks" link.
+
 2011-04-06  Zan Dobersek  <zandobersek@gmail.com>