Changeset 259809 in webkit

Timestamp:

Apr 9, 2020, 11:17:56 AM (6 years ago)

Author:

aakash_jain@apple.com

Message:

[ews] rename CompileJSCToT to CompileJSCWithoutPatch
​https://bugs.webkit.org/show_bug.cgi?id=210265

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py:

(CompileWebKitWithoutPatch): Drive-by fix to rename similar name.
(AnalyzeCompileWebKitResults.start): Ditto.
(CompileWebKit.evaluateCommand): Renamed CompileJSCToT to CompileJSCWithoutPatch.
(CompileJSCWithoutPatch): Ditto.
(ReRunJavaScriptCoreTests.evaluateCommand): Ditto.

• BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (5 diffs)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -1309 +1309 @@
                 steps_to_add.append(InstallGtkDependencies())
             if self.getProperty('group') == 'jsc':
-                steps_to_add.append(CompileJSCToT())
+                steps_to_add.append(CompileJSCWithoutPatch())
             else:
                 steps_to_add.append(CompileWebKitWithoutPatch())
@@ -1329 +1329 @@
 
 class CompileWebKitWithoutPatch(CompileWebKit):
-    name = 'compile-webkit-tot'
+    name = 'compile-webkit-without-patch'
     haltOnFailure = False
 
@@ -1348 +1348 @@
 
     def start(self):
-        compile_tot_step = CompileWebKitWithoutPatch.name
+        compile_without_patch_step = CompileWebKitWithoutPatch.name
         if self.getProperty('group') == 'jsc':
-            compile_tot_step = CompileJSCToT.name
-        compile_webkit_tot_result = self.getStepResult(compile_tot_step)
-
-        if compile_webkit_tot_result == FAILURE:
+            compile_without_patch_step = CompileJSCWithoutPatch.name
+        compile_without_patch_result = self.getStepResult(compile_without_patch_step)
+
+        if compile_without_patch_result == FAILURE:
             self.finished(FAILURE)
             message = 'Unable to build WebKit without patch, retrying build'
@@ -1395 +1395 @@
 
 
-class CompileJSCToT(CompileJSC):
-    name = 'compile-jsc-tot'
+class CompileJSCWithoutPatch(CompileJSC):
+    name = 'compile-jsc-without-patch'
 
     def evaluateCommand(self, cmd):
@@ -1515 +1515 @@
             self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(),
                                                 ValidatePatch(verifyBugClosed=False, addURLs=False),
-                                                CompileJSCToT(),
+                                                CompileJSCWithoutPatch(),
                                                 ValidatePatch(verifyBugClosed=False, addURLs=False),
                                                 KillOldProcesses(),

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -38 +38 @@
                    AnalyzeLayoutTestsResults, ApplyPatch, ApplyWatchList, ArchiveBuiltProduct, ArchiveTestResults,
                    CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance, CheckPatchStatusOnEWSQueues, CheckStyle,
-                   CleanBuild, CleanUpGitIndexLock, CleanWorkingDirectory, CompileJSC, CompileJSCToT, CompileWebKit,
+                   CleanBuild, CleanUpGitIndexLock, CleanWorkingDirectory, CompileJSC, CompileJSCWithoutPatch, CompileWebKit,
                    CompileWebKitWithoutPatch, ConfigureBuild, CreateLocalGITCommit,
                    DownloadBuiltProduct, DownloadBuiltProductFromMaster, ExtractBuiltProduct, ExtractTestResults,
@@ -1083 +1083 @@
         return rc
 
-    def test_patch_with_ToT_failure(self):
+    def test_patch_with_trunk_failure(self):
         previous_steps = [
             mock_step(CompileWebKit(), results=FAILURE),
@@ -1131 +1131 @@
 
 
-class TestCompileJSCToT(BuildStepMixinAdditions, unittest.TestCase):
-    def setUp(self):
-        self.longMessage = True
-        return self.setUpBuildStep()
-
-    def tearDown(self):
-        return self.tearDownBuildStep()
-
-    def test_success(self):
-        self.setupStep(CompileJSCToT())
+class TestCompileJSCWithoutPatch(BuildStepMixinAdditions, unittest.TestCase):
+    def setUp(self):
+        self.longMessage = True
+        return self.setUpBuildStep()
+
+    def tearDown(self):
+        return self.tearDownBuildStep()
+
+    def test_success(self):
+        self.setupStep(CompileJSCWithoutPatch())
         self.setProperty('fullPlatform', 'jsc-only')
         self.setProperty('configuration', 'release')
@@ -1155 +1155 @@
 
     def test_failure(self):
-        self.setupStep(CompileJSCToT())
+        self.setupStep(CompileJSCWithoutPatch())
         self.setProperty('fullPlatform', 'jsc-only')
         self.setProperty('configuration', 'debug')

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-09  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] rename CompileJSCToT to CompileJSCWithoutPatch
+        https://bugs.webkit.org/show_bug.cgi?id=210265
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (CompileWebKitWithoutPatch): Drive-by fix to rename similar name.
+        (AnalyzeCompileWebKitResults.start): Ditto.
+        (CompileWebKit.evaluateCommand): Renamed CompileJSCToT to CompileJSCWithoutPatch.
+        (CompileJSCWithoutPatch): Ditto.
+        (ReRunJavaScriptCoreTests.evaluateCommand): Ditto.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+
 2020-04-09  Claudio Saavedra  <csaavedra@igalia.com>