Title: [250174] trunk/Tools
- Revision
- 250174
- Author
- aakash_j...@apple.com
- Date
- 2019-09-20 18:07:49 -0700 (Fri, 20 Sep 2019)
Log Message
[EWS] JSC queues should re-build ToT and compare results on build failure
https://bugs.webkit.org/show_bug.cgi?id=201999
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/factories.py:
(JSCTestsFactory.__init__): Do not add the UnApplyPatchIfRequired and CompileJSCOnlyToT step here, as
these are dynamically added (if required) in steps.py in CompileWebKit.evaluateCommand() using addStepsAfterCurrentStep().
Also setting skipUpload=False since we don't need to upload the archive for this queue. Building and testing is done in same build.
* BuildSlaveSupport/ews-build/steps.py:
(CompileWebKit.evaluateCommand): Add CompileJSCOnlyToT or CompileWebKitToT build-step based on 'group' property.
(AnalyzeCompileWebKitResults.start): Ditto.
(CompileJSCOnly.start): Set the 'group' property to 'jsc'.
(CompileJSCOnlyToT.evaluateCommand): Over-ride evaluateCommand, so that base-class' (CompileWebKit) evaluateCommand is
not used, base class evaluateCommand adds build-steps dynamically.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (250173 => 250174)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-09-21 00:36:06 UTC (rev 250173)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-09-21 01:07:49 UTC (rev 250174)
@@ -118,9 +118,7 @@
class JSCTestsFactory(Factory):
def __init__(self, platform, configuration='release', architectures=None, additionalArguments=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, checkRelevance=True)
- self.addStep(CompileJSCOnly())
- self.addStep(UnApplyPatchIfRequired())
- self.addStep(CompileJSCOnlyToT())
+ self.addStep(CompileJSCOnly(skipUpload=True))
self.addStep(RunJavaScriptCoreTests())
self.addStep(ReRunJavaScriptCoreTests())
self.addStep(UnApplyPatchIfRequired())
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (250173 => 250174)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-09-21 00:36:06 UTC (rev 250173)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-09-21 01:07:49 UTC (rev 250174)
@@ -744,7 +744,10 @@
steps_to_add.append(InstallWpeDependencies())
elif platform == 'gtk':
steps_to_add.append(InstallGtkDependencies())
- steps_to_add.append(CompileWebKitToT())
+ if self.getProperty('group') == 'jsc':
+ steps_to_add.append(CompileJSCOnlyToT())
+ else:
+ steps_to_add.append(CompileWebKitToT())
steps_to_add.append(AnalyzeCompileWebKitResults())
# Using a single addStepsAfterCurrentStep because of https://github.com/buildbot/buildbot/issues/4874
self.build.addStepsAfterCurrentStep(steps_to_add)
@@ -776,7 +779,10 @@
descriptionDone = ['analyze-compile-webkit-results']
def start(self):
- compile_webkit_tot_result = self.getStepResult(CompileWebKitToT.name)
+ compile_tot_step = CompileWebKitToT.name
+ if self.getProperty('group') == 'jsc':
+ compile_tot_step = CompileJSCOnlyToT.name
+ compile_webkit_tot_result = self.getStepResult(compile_tot_step)
if compile_webkit_tot_result == FAILURE:
self.finished(FAILURE)
@@ -804,7 +810,11 @@
descriptionDone = ['Compiled JSC']
command = ['perl', 'Tools/Scripts/build-jsc', WithProperties('--%(configuration)s')]
+ def start(self):
+ self.setProperty('group', 'jsc')
+ return CompileWebKit.start(self)
+
class CompileJSCOnlyToT(CompileJSCOnly):
name = 'build-jsc-tot'
@@ -814,7 +824,10 @@
def hideStepIf(self, results, step):
return not self.doStepIf(step)
+ def evaluateCommand(self, cmd):
+ return shell.Compile.evaluateCommand(self, cmd)
+
class RunJavaScriptCoreTests(shell.Test):
name = 'jscore-test'
description = ['jscore-tests running']
Modified: trunk/Tools/ChangeLog (250173 => 250174)
--- trunk/Tools/ChangeLog 2019-09-21 00:36:06 UTC (rev 250173)
+++ trunk/Tools/ChangeLog 2019-09-21 01:07:49 UTC (rev 250174)
@@ -1,3 +1,21 @@
+2019-09-20 Aakash Jain <aakash_j...@apple.com>
+
+ [EWS] JSC queues should re-build ToT and compare results on build failure
+ https://bugs.webkit.org/show_bug.cgi?id=201999
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/factories.py:
+ (JSCTestsFactory.__init__): Do not add the UnApplyPatchIfRequired and CompileJSCOnlyToT step here, as
+ these are dynamically added (if required) in steps.py in CompileWebKit.evaluateCommand() using addStepsAfterCurrentStep().
+ Also setting skipUpload=False since we don't need to upload the archive for this queue. Building and testing is done in same build.
+ * BuildSlaveSupport/ews-build/steps.py:
+ (CompileWebKit.evaluateCommand): Add CompileJSCOnlyToT or CompileWebKitToT build-step based on 'group' property.
+ (AnalyzeCompileWebKitResults.start): Ditto.
+ (CompileJSCOnly.start): Set the 'group' property to 'jsc'.
+ (CompileJSCOnlyToT.evaluateCommand): Over-ride evaluateCommand, so that base-class' (CompileWebKit) evaluateCommand is
+ not used, base class evaluateCommand adds build-steps dynamically.
+
2019-09-20 Keith Rollin <krol...@apple.com>
Remove some support for < iOS 13
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
