Changeset 289015 in webkit


Ignore:
Timestamp:
Feb 2, 2022, 4:34:50 PM (4 years ago)
Author:
Jonathan Bedard
Message:

[EWS] Rename CompileWebKitWithoutPatch to CompileWebKitWithoutChange
​https://bugs.webkit.org/show_bug.cgi?id=235949
<rdar://problem/88325688>

Reviewed by Aakash Jain.

  • Tools/CISupport/ews-build/steps.py:

(CompileWebKit.evaluateCommand): Rename CompileWebKitWithoutPatch
to CompileWebKitWithoutChange.
(CompileWebKitWithoutChange): Ditto.
(AnalyzeCompileWebKitResults.analyzeResults): Ditto.
(ReRunWebKitTests.evaluateCommand): Rename CompileWebKitWithoutPatch
to CompileWebKitWithoutChange, only retry if build is for a patch.
(RunWebKitTestsRedTree.evaluateCommand): Ditto.
(RunWebKitTestsRepeatFailuresRedTree.evaluateCommand): Ditto.
(ReRunAPITests.evaluateCommand): Ditto.
(CompileWebKitWithoutPatch): Renamed to CompileWebKitWithoutChange.

  • Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: ​https://commits.webkit.org/246724@main

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/CISupport/ews-build/steps.py

    r288911 r289015  
    19621962                steps_to_add.append(CompileJSCWithoutPatch())
    19631963            else:
    1964                 steps_to_add.append(CompileWebKitWithoutPatch())
     1964                steps_to_add.append(CompileWebKitWithoutChange())
    19651965            steps_to_add.append(AnalyzeCompileWebKitResults())
    19661966            # Using a single addStepsAfterCurrentStep because of https://github.com/buildbot/buildbot/issues/4874
    … …  
    19901990
    19911991
    1992 class CompileWebKitWithoutPatch(CompileWebKit):
    1993     name = 'compile-webkit-without-patch'
     1992class CompileWebKitWithoutChange(CompileWebKit):
     1993    name = 'compile-webkit-without-change'
    19941994    haltOnFailure = False
    19951995
    19961996    def __init__(self, retry_build_on_failure=False, **kwargs):
    19971997        self.retry_build_on_failure = retry_build_on_failure
    1998         super(CompileWebKitWithoutPatch, self).__init__(**kwargs)
     1998        super(CompileWebKitWithoutChange, self).__init__(**kwargs)
    19991999
    20002000    def evaluateCommand(self, cmd):
    20012001        rc = shell.Compile.evaluateCommand(self, cmd)
    20022002        if rc == FAILURE and self.retry_build_on_failure:
    2003             message = 'Unable to build WebKit without patch, retrying build'
     2003            message = 'Unable to build WebKit without change, retrying build'
    20042004            self.descriptionDone = message
    20052005            self.send_email_for_unexpected_build_failure()
    … …  
    20362036
    20372037    def analyzeResults(self):
    2038         compile_without_patch_step = CompileWebKitWithoutPatch.name
     2038        compile_without_patch_step = CompileWebKitWithoutChange.name
    20392039        if self.getProperty('group') == 'jsc':
    20402040            compile_without_patch_step = CompileJSCWithoutPatch.name
    … …  
    27672767                                                RevertPullRequestChanges(),
    27682768                                                ValidateChange(verifyBugClosed=False, addURLs=False),
    2769                                                 CompileWebKitWithoutPatch(retry_build_on_failure=True),
     2769                                                CompileWebKitWithoutChange(retry_build_on_failure=True),
    27702770                                                ValidateChange(verifyBugClosed=False, addURLs=False),
    27712771                                                KillOldProcesses(),
    … …  
    31143114                next_steps.append(AnalyzeLayoutTestsResultsRedTree())
    31153115            else:
    3116                 next_steps.extend([UnApplyPatch(), RevertPullRequestChanges(), CompileWebKitWithoutPatch(retry_build_on_failure=True), ValidateChange(verifyBugClosed=False, addURLs=False), RunWebKitTestsWithoutPatchRedTree()])
     3116                next_steps.extend([
     3117                    UnApplyPatch(),
     3118                    RevertPullRequestChanges(),
     3119                    CompileWebKitWithoutChange(retry_build_on_failure=True),
     3120                    ValidateChange(verifyBugClosed=False, addURLs=False),
     3121                    RunWebKitTestsWithoutPatchRedTree(),
     3122                ])
    31173123        if next_steps:
    31183124            self.build.addStepsAfterCurrentStep(next_steps)
    … …  
    31433149        next_steps = [ArchiveTestResults(), UploadTestResults(identifier='repeat-failures'), ExtractTestResults(identifier='repeat-failures')]
    31443150        if with_patch_repeat_failures_results_nonflaky_failures or with_patch_repeat_failures_timedout:
    3145             next_steps.extend([ValidateChange(verifyBugClosed=False, addURLs=False), KillOldProcesses(), UnApplyPatch(), RevertPullRequestChanges(), CompileWebKitWithoutPatch(retry_build_on_failure=True),
    3146                                ValidateChange(verifyBugClosed=False, addURLs=False), RunWebKitTestsRepeatFailuresWithoutPatchRedTree()])
     3151            next_steps.extend([
     3152                ValidateChange(verifyBugClosed=False, addURLs=False),
     3153                KillOldProcesses(),
     3154                UnApplyPatch(),
     3155                RevertPullRequestChanges(),
     3156                CompileWebKitWithoutChange(retry_build_on_failure=True),
     3157                ValidateChange(verifyBugClosed=False, addURLs=False),
     3158                RunWebKitTestsRepeatFailuresWithoutPatchRedTree(),
     3159            ])
    31473160        else:
    31483161            next_steps.append(AnalyzeLayoutTestsResultsRedTree())
    … …  
    35683581            elif platform == 'gtk':
    35693582                steps_to_add.append(InstallGtkDependencies())
    3570             steps_to_add.append(CompileWebKitWithoutPatch(retry_build_on_failure=True))
     3583            steps_to_add.append(CompileWebKitWithoutChange(retry_build_on_failure=True))
    35713584            steps_to_add.append(ValidateChange(verifyBugClosed=False, addURLs=False))
    35723585            steps_to_add.append(KillOldProcesses())

  • trunk/Tools/CISupport/ews-build/steps_unittest.py

    r288958 r289015  
    4545                   CheckOutPullRequest, CheckOutSource, CheckOutSpecificRevision, CheckChangeRelevance, CheckPatchStatusOnEWSQueues, CheckStyle,
    4646                   CleanBuild, CleanUpGitIndexLock, CleanGitRepo, CleanWorkingDirectory, CompileJSC, CompileJSCWithoutPatch,
    47                    CompileWebKit, CompileWebKitWithoutPatch, ConfigureBuild, ConfigureBuild, Contributors, CreateLocalGITCommit,
     47                   CompileWebKit, CompileWebKitWithoutChange, ConfigureBuild, ConfigureBuild, Contributors, CreateLocalGITCommit,
    4848                   DownloadBuiltProduct, DownloadBuiltProductFromMaster, EWS_BUILD_HOSTNAME, ExtractBuiltProduct, ExtractTestResults,
    4949                   FetchBranches, FindModifiedChangeLogs, FindModifiedLayoutTests, GitResetHard,
    … …  
    11651165
    11661166
    1167 class TestCompileWebKitWithoutPatch(BuildStepMixinAdditions, unittest.TestCase):
    1168     def setUp(self):
    1169         self.longMessage = True
    1170         return self.setUpBuildStep()
    1171 
    1172     def tearDown(self):
    1173         return self.tearDownBuildStep()
    1174 
    1175     def test_success(self):
    1176         self.setupStep(CompileWebKitWithoutPatch())
     1167class TestCompileWebKitWithoutChange(BuildStepMixinAdditions, unittest.TestCase):
     1168    def setUp(self):
     1169        self.longMessage = True
     1170        return self.setUpBuildStep()
     1171
     1172    def tearDown(self):
     1173        return self.tearDownBuildStep()
     1174
     1175    def test_success(self):
     1176        self.setupStep(CompileWebKitWithoutChange())
    11771177        self.setProperty('fullPlatform', 'ios-simulator-11')
    11781178        self.setProperty('configuration', 'release')
    … …  
    11881188
    11891189    def test_failure(self):
    1190         self.setupStep(CompileWebKitWithoutPatch())
     1190        self.setupStep(CompileWebKitWithoutChange())
    11911191        self.setProperty('fullPlatform', 'mac-sierra')
    11921192        self.setProperty('configuration', 'debug')
    … …  
    12151215        previous_steps = [
    12161216            mock_step(CompileWebKit(), results=FAILURE),
    1217             mock_step(CompileWebKitWithoutPatch(), results=SUCCESS),
     1217            mock_step(CompileWebKitWithoutChange(), results=SUCCESS),
    12181218        ]
    12191219        self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
    … …  
    12281228        previous_steps = [
    12291229            mock_step(CompileWebKit(), results=FAILURE),
    1230             mock_step(CompileWebKitWithoutPatch(), results=SUCCESS),
     1230            mock_step(CompileWebKitWithoutChange(), results=SUCCESS),
    12311231        ]
    12321232        self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
    … …  
    12411241        previous_steps = [
    12421242            mock_step(CompileWebKit(), results=FAILURE),
    1243             mock_step(CompileWebKitWithoutPatch(), results=SUCCESS),
     1243            mock_step(CompileWebKitWithoutChange(), results=SUCCESS),
    12441244        ]
    12451245        self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
    … …  
    12551255        previous_steps = [
    12561256            mock_step(CompileWebKit(), results=FAILURE),
    1257             mock_step(CompileWebKitWithoutPatch(), results=FAILURE),
     1257            mock_step(CompileWebKitWithoutChange(), results=FAILURE),
    12581258        ]
    12591259        self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)

  • trunk/Tools/ChangeLog

    r288999 r289015  
     12022-02-01  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [EWS] Rename CompileWebKitWithoutPatch to CompileWebKitWithoutChange
     4        https://bugs.webkit.org/show_bug.cgi?id=235949
     5        <rdar://problem/88325688>
     6
     7        Reviewed by Aakash Jain.
     8
     9        * CISupport/ews-build/steps.py:
     10        (CompileWebKit.evaluateCommand): Rename CompileWebKitWithoutPatch
     11        to CompileWebKitWithoutChange.
     12        (CompileWebKitWithoutChange): Ditto.
     13        (AnalyzeCompileWebKitResults.analyzeResults): Ditto.
     14        (ReRunWebKitTests.evaluateCommand): Rename CompileWebKitWithoutPatch
     15        to CompileWebKitWithoutChange, only retry if build is for a patch.
     16        (RunWebKitTestsRedTree.evaluateCommand): Ditto.
     17        (RunWebKitTestsRepeatFailuresRedTree.evaluateCommand): Ditto.
     18        (ReRunAPITests.evaluateCommand): Ditto.
     19        (CompileWebKitWithoutPatch): Renamed to CompileWebKitWithoutChange.
     20        * CISupport/ews-build/steps_unittest.py:
     21
    1222022-02-02  Timothy Hatcher  <timothy@apple.com>
    223
Note: See TracChangeset for help on using the changeset viewer.