Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (259786 => 259787)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-04-09 09:27:40 UTC (rev 259786)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-04-09 10:05:58 UTC (rev 259787)
@@ -1310,7 +1310,7 @@
if self.getProperty('group') == 'jsc':
steps_to_add.append(CompileJSCToT())
else:
- steps_to_add.append(CompileWebKitToT())
+ steps_to_add.append(CompileWebKitWithoutPatch())
steps_to_add.append(AnalyzeCompileWebKitResults())
# Using a single addStepsAfterCurrentStep because of https://github.com/buildbot/buildbot/issues/4874
self.build.addStepsAfterCurrentStep(steps_to_add)
@@ -1327,7 +1327,7 @@
return shell.Compile.getResultSummary(self)
-class CompileWebKitToT(CompileWebKit):
+class CompileWebKitWithoutPatch(CompileWebKit):
name = 'compile-webkit-tot'
haltOnFailure = False
@@ -1347,7 +1347,7 @@
descriptionDone = ['analyze-compile-webkit-results']
def start(self):
- compile_tot_step = CompileWebKitToT.name
+ compile_tot_step = CompileWebKitWithoutPatch.name
if self.getProperty('group') == 'jsc':
compile_tot_step = CompileJSCToT.name
compile_webkit_tot_result = self.getStepResult(compile_tot_step)
@@ -1818,7 +1818,7 @@
ExtractTestResults(identifier='rerun'),
UnApplyPatchIfRequired(),
ValidatePatch(verifyBugClosed=False, addURLs=False),
- CompileWebKitToT(),
+ CompileWebKitWithoutPatch(),
ValidatePatch(verifyBugClosed=False, addURLs=False),
KillOldProcesses(),
RunWebKitTestsWithoutPatch()])
@@ -2174,7 +2174,7 @@
steps_to_add.append(InstallWpeDependencies())
elif platform == 'gtk':
steps_to_add.append(InstallGtkDependencies())
- steps_to_add.append(CompileWebKitToT())
+ steps_to_add.append(CompileWebKitWithoutPatch())
steps_to_add.append(ValidatePatch(verifyBugClosed=False, addURLs=False))
steps_to_add.append(KillOldProcesses())
steps_to_add.append(RunAPITestsWithoutPatch())
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (259786 => 259787)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-04-09 09:27:40 UTC (rev 259786)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-04-09 10:05:58 UTC (rev 259787)
@@ -38,7 +38,7 @@
AnalyzeLayoutTestsResults, ApplyPatch, ApplyWatchList, ArchiveBuiltProduct, ArchiveTestResults,
CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance, CheckPatchStatusOnEWSQueues, CheckStyle,
CleanBuild, CleanUpGitIndexLock, CleanWorkingDirectory, CompileJSC, CompileJSCToT, CompileWebKit,
- CompileWebKitToT, ConfigureBuild, CreateLocalGITCommit,
+ CompileWebKitWithoutPatch, ConfigureBuild, CreateLocalGITCommit,
DownloadBuiltProduct, DownloadBuiltProductFromMaster, ExtractBuiltProduct, ExtractTestResults,
FindModifiedChangeLogs, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
PrintConfiguration, PushCommitToWebKitRepo, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitPerlTests,
@@ -999,7 +999,7 @@
return self.runStep()
-class TestCompileWebKitToT(BuildStepMixinAdditions, unittest.TestCase):
+class TestCompileWebKitWithoutPatch(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
return self.setUpBuildStep()
@@ -1008,7 +1008,7 @@
return self.tearDownBuildStep()
def test_success(self):
- self.setupStep(CompileWebKitToT())
+ self.setupStep(CompileWebKitWithoutPatch())
self.setProperty('fullPlatform', 'ios-simulator-11')
self.setProperty('configuration', 'release')
self.setProperty('patchFailedToBuild', True)
@@ -1023,7 +1023,7 @@
return self.runStep()
def test_failure(self):
- self.setupStep(CompileWebKitToT())
+ self.setupStep(CompileWebKitWithoutPatch())
self.setProperty('fullPlatform', 'mac-sierra')
self.setProperty('configuration', 'debug')
self.setProperty('patchFailedTests', True)
@@ -1039,7 +1039,7 @@
return self.runStep()
def test_skip(self):
- self.setupStep(CompileWebKitToT())
+ self.setupStep(CompileWebKitWithoutPatch())
self.setProperty('fullPlatform', 'ios-simulator-11')
self.setProperty('configuration', 'release')
self.expectHidden(True)
@@ -1058,7 +1058,7 @@
def test_patch_with_build_failure(self):
previous_steps = [
mock_step(CompileWebKit(), results=FAILURE),
- mock_step(CompileWebKitToT(), results=SUCCESS),
+ mock_step(CompileWebKitWithoutPatch(), results=SUCCESS),
]
self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
self.setProperty('patch_id', '1234')
@@ -1071,7 +1071,7 @@
def test_patch_with_build_failure_on_commit_queue(self):
previous_steps = [
mock_step(CompileWebKit(), results=FAILURE),
- mock_step(CompileWebKitToT(), results=SUCCESS),
+ mock_step(CompileWebKitWithoutPatch(), results=SUCCESS),
]
self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
self.setProperty('patch_id', '1234')
@@ -1085,7 +1085,7 @@
def test_patch_with_ToT_failure(self):
previous_steps = [
mock_step(CompileWebKit(), results=FAILURE),
- mock_step(CompileWebKitToT(), results=FAILURE),
+ mock_step(CompileWebKitWithoutPatch(), results=FAILURE),
]
self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
self.expectOutcome(result=FAILURE, state_string='Unable to build WebKit without patch, retrying build (failure)')
