Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (177574 => 177575)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-12-19 17:23:10 UTC (rev 177574)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-12-19 17:57:21 UTC (rev 177575)
@@ -161,15 +161,6 @@
return SKIPPED
return shell.Compile.start(self)
-class CleanBuildUnconditionally(shell.Compile):
- name = "delete WebKitBuild directory"
- description = ["deleting WebKitBuild directory"]
- descriptionDone = ["deleted WebKitBuild directory"]
- command = ["python", "./Tools/BuildSlaveSupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
-
- def start(self):
- return shell.Compile.start(self)
-
class DeleteStaleBuildFiles(shell.Compile):
name = "delete stale build files"
description = ["deleting stale build files"]
@@ -713,6 +704,7 @@
"--builder-name", WithProperties("%(buildername)s"),
"--build-number", WithProperties("%(buildnumber)s"),
"--platform", WithProperties("%(fullPlatform)s"),
+ "--no-build",
WithProperties("--%(configuration)s")]
def start(self):
@@ -931,8 +923,6 @@
class DownloadAndPerfTestFactory(Factory):
def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
- if platform == 'mac':
- self.addStep(CleanBuildUnconditionally())
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunAndUploadPerfTests())
@@ -940,8 +930,6 @@
class DownloadAndPerfTestWebKit2Factory(Factory):
def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
- if platform == 'mac':
- self.addStep(CleanBuildUnconditionally())
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunAndUploadPerfTestsWebKit2())
Modified: trunk/Tools/ChangeLog (177574 => 177575)
--- trunk/Tools/ChangeLog 2014-12-19 17:23:10 UTC (rev 177574)
+++ trunk/Tools/ChangeLog 2014-12-19 17:57:21 UTC (rev 177575)
@@ -1,3 +1,20 @@
+2014-12-19 Alexey Proskuryakov <[email protected]>
+
+ Clean up a fix for performance test bot failing to build
+ https://bugs.webkit.org/show_bug.cgi?id=139818
+
+ Reviewed by Csaba Osztrogonác.
+
+ The "_1" in step name was annoying.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (CleanBuildIfScheduled.start):
+ (RunAndUploadPerfTests):
+ (DownloadAndPerfTestFactory.__init__):
+ (DownloadAndPerfTestWebKit2Factory.__init__):
+ (CleanBuildUnconditionally): Deleted.
+ (CleanBuildUnconditionally.start): Deleted.
+
2014-12-19 Csaba Osztrogonác <[email protected]>
REGRESSION(r177535): It broke the GTK performance bot
