Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (99330 => 99331)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-11-04 22:50:54 UTC (rev 99330)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-11-04 22:52:26 UTC (rev 99331)
@@ -602,20 +602,6 @@
self.addURL("view leaks", url)
-class StopATSServer(shell.ShellCommand):
- command = ["launchctl", "stop", "com.apple.ATSServer"]
- name = "stop-ats-server"
- description = ["stopping ATSServer"]
- descriptionDone = ["stopped ATSServer"]
-
-
-class StartATSServer(shell.ShellCommand):
- command = ["launchctl", "start", "com.apple.ATSServer"]
- name = "start-ats-server"
- description = ["starting ATSServer"]
- descriptionDone = ["started ATSServer"]
-
-
class Factory(factory.BuildFactory):
def __init__(self, platform, configuration, architectures, buildOnly, features=None, **kwargs):
factory.BuildFactory.__init__(self)
@@ -638,7 +624,7 @@
self.addStep(trigger.Trigger, schedulerNames=triggers)
def unitTestsSupported(configuration, platform):
- return (platform == 'win' or (platform.startswith('mac') and platform != 'mac-leopard')
+ return (platform == 'win' or platform.startswith('mac')
or (platform.startswith('chromium') and platform != 'chromium-android'))
class TestFactory(Factory):
@@ -646,10 +632,6 @@
ExtractTestResultsClass = ExtractTestResults
def __init__(self, platform, configuration, architectures, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
- if platform == "mac-leopard":
- # Work around an ATSServer leak. See <http://webkit.org/b/51807>.
- self.addStep(StopATSServer)
- self.addStep(StartATSServer)
self.addStep(DownloadBuiltProduct)
self.addStep(ExtractBuiltProduct)
self.addStep(RunJavaScriptCoreTests, buildJSCTool=False)
Modified: trunk/Tools/ChangeLog (99330 => 99331)
--- trunk/Tools/ChangeLog 2011-11-04 22:50:54 UTC (rev 99330)
+++ trunk/Tools/ChangeLog 2011-11-04 22:52:26 UTC (rev 99331)
@@ -1,3 +1,18 @@
+2011-11-04 Adam Roben <aro...@apple.com>
+
+ Remove Leopard-specific code from build.webkit.org
+
+ We don't have any Leopard bots anymore.
+
+ Fixes <http://webkit.org/b/71583> build.webkit.org configuration contains obsolete Leopard code
+
+ Reviewed by Mark Rowe.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg: Removed now-unused StartATSServer
+ and StopATSServer steps.
+ (unitTestsSupported): Removed check for mac-leopard.
+ (TestFactory.__init__): Removed Leopard-specific steps.
+
2011-11-04 Eric Seidel <e...@webkit.org>
new-run-webkit-tests autoinstalls python-irclib even though it doesn't need to
