Changeset 246822 in webkit


Ignore:
Timestamp:
Jun 25, 2019 5:56:44 PM (5 years ago)
Author:
aakash_jain@apple.com
Message:

[ews-build] Combine various patchFailed*Tests properties
​https://bugs.webkit.org/show_bug.cgi?id=199193

Reviewed by Jonathan Bedard.

  • BuildSlaveSupport/ews-build/steps.py: Renamed patchFailedJSCTests and patchFailedAPITests to patchFailedTests. This property

can also be used for layout-tests later on.

  • BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r246793 r246822  
    402402
    403403    def doStepIf(self, step):
    404         return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedJSCTests') or self.getProperty('patchFailedAPITests')
     404        return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedTests')
    405405
    406406    def hideStepIf(self, results, step):
    … …  
    648648
    649649    def doStepIf(self, step):
    650         return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedAPITests')
     650        return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedTests')
    651651
    652652    def hideStepIf(self, results, step):
    … …  
    717717    def evaluateCommand(self, cmd):
    718718        if cmd.didFail():
    719             self.setProperty('patchFailedJSCTests', True)
     719            self.setProperty('patchFailedTests', True)
    720720
    721721        return super(RunJavaScriptCoreTests, self).evaluateCommand(cmd)
    … …  
    726726
    727727    def doStepIf(self, step):
    728         return self.getProperty('patchFailedJSCTests')
     728        return self.getProperty('patchFailedTests')
    729729
    730730    def hideStepIf(self, results, step):
    … …  
    732732
    733733    def evaluateCommand(self, cmd):
    734         self.setProperty('patchFailedJSCTests', cmd.didFail())
     734        self.setProperty('patchFailedTests', cmd.didFail())
    735735        return super(RunJavaScriptCoreTests, self).evaluateCommand(cmd)
    736736
    … …  
    742742
    743743    def doStepIf(self, step):
    744         return self.getProperty('patchFailedJSCTests')
     744        return self.getProperty('patchFailedTests')
    745745
    746746    def hideStepIf(self, results, step):
    … …  
    951951            self.build.buildFinished([message], SUCCESS)
    952952        else:
    953             self.setProperty('patchFailedAPITests', True)
     953            self.setProperty('patchFailedTests', True)
    954954            self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileWebKitToT(), RunAPITestsWithoutPatch(), AnalyzeAPITestsResults()])
    955955        return rc

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

    r246793 r246822  
    533533        self.setProperty('fullPlatform', 'mac-sierra')
    534534        self.setProperty('configuration', 'debug')
    535         self.setProperty('patchFailedToBuild', True)
     535        self.setProperty('patchFailedTests', True)
    536536        self.expectRemoteCommands(
    537537            ExpectShell(workdir='wkdir',
    … …  
    714714        self.setProperty('fullPlatform', 'jsc-only')
    715715        self.setProperty('configuration', 'release')
    716         self.setProperty('patchFailedJSCTests', 'True')
     716        self.setProperty('patchFailedTests', 'True')
    717717        self.expectRemoteCommands(
    718718            ExpectShell(workdir='wkdir',
    … …  
    729729        self.setProperty('fullPlatform', 'jsc-only')
    730730        self.setProperty('configuration', 'debug')
    731         self.setProperty('patchFailedJSCTests', 'True')
     731        self.setProperty('patchFailedTests', 'True')
    732732        self.expectRemoteCommands(
    733733            ExpectShell(workdir='wkdir',
    … …  
    763763        self.setProperty('fullPlatform', 'jsc-only')
    764764        self.setProperty('configuration', 'release')
    765         self.setProperty('patchFailedJSCTests', 'True')
     765        self.setProperty('patchFailedTests', 'True')
    766766        self.expectRemoteCommands(
    767767            ExpectShell(workdir='wkdir',
    … …  
    778778        self.setProperty('fullPlatform', 'jsc-only')
    779779        self.setProperty('configuration', 'debug')
    780         self.setProperty('patchFailedJSCTests', 'True')
     780        self.setProperty('patchFailedTests', 'True')
    781781        self.expectRemoteCommands(
    782782            ExpectShell(workdir='wkdir',
    … …  
    970970    def test_failure(self):
    971971        self.setupStep(UnApplyPatchIfRequired())
    972         self.setProperty('patchFailedToBuild', True)
     972        self.setProperty('patchFailedTests', True)
    973973        self.expectHidden(False)
    974974        self.expectRemoteCommands(

  • trunk/Tools/ChangeLog

    r246814 r246822  
     12019-06-25  Aakash Jain  <aakash_jain@apple.com>
     2
     3        [ews-build] Combine various patchFailed*Tests properties
     4        https://bugs.webkit.org/show_bug.cgi?id=199193
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        * BuildSlaveSupport/ews-build/steps.py: Renamed patchFailedJSCTests and patchFailedAPITests to patchFailedTests. This property
     9        can also be used for layout-tests later on.
     10        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
     11
    1122019-06-25  Ross Kirsling  <ross.kirsling@sony.com>
    213
Note: See TracChangeset for help on using the changeset viewer.