Changeset 247305 in webkit


Ignore:
Timestamp:
Jul 10, 2019 9:10:59 AM (5 years ago)
Author:
aakash_jain@apple.com
Message:

[ews-build] Explicitly use perl or python while invoking scripts
​https://bugs.webkit.org/show_bug.cgi?id=199669

Reviewed by Jonathan Bedard.

  • BuildSlaveSupport/ews-build/steps.py: Explicitly added perl or python while invoking scripts.
  • BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests accordingly.
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r247258 r247305  
    135135    flunkOnFailure = True
    136136    haltOnFailure = True
    137     command = ['Tools/Scripts/clean-webkit']
     137    command = ['python', 'Tools/Scripts/clean-webkit']
    138138
    139139    def __init__(self, **kwargs):
    … …  
    147147    flunkOnFailure = True
    148148    haltOnFailure = True
    149     command = ['Tools/Scripts/svn-apply', '--force', '.buildbot-diff']
     149    command = ['perl', 'Tools/Scripts/svn-apply', '--force', '.buildbot-diff']
    150150
    151151    def __init__(self, **kwargs):
    … …  
    480480    flunkOnFailure = True
    481481    failedTestsFormatString = '%d style error%s'
    482     command = ['Tools/Scripts/check-webkit-style']
     482    command = ['python', 'Tools/Scripts/check-webkit-style']
    483483
    484484    def countFailures(self, cmd):
    … …  
    498498    jsonFileName = 'bindings_test_results.json'
    499499    logfiles = {'json': jsonFileName}
    500     command = ['Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(jsonFileName)]
     500    command = ['python', 'Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(jsonFileName)]
    501501
    502502    def __init__(self, **kwargs):
    … …  
    545545    descriptionDone = ['webkitperl-tests']
    546546    flunkOnFailure = True
    547     command = ['Tools/Scripts/test-webkitperl']
     547    command = ['perl', 'Tools/Scripts/test-webkitperl']
    548548
    549549    def __init__(self, **kwargs):
    … …  
    558558    jsonFileName = 'webkitpy_test_results.json'
    559559    logfiles = {'json': jsonFileName}
    560     command = ['Tools/Scripts/test-webkitpy', '--json-output={0}'.format(jsonFileName)]
     560    command = ['python', 'Tools/Scripts/test-webkitpy', '--json-output={0}'.format(jsonFileName)]
    561561
    562562    def __init__(self, **kwargs):

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

    r247258 r247305  
    212212        self.expectRemoteCommands(
    213213            ExpectShell(workdir='wkdir',
    214                         command=['Tools/Scripts/check-webkit-style'],
     214                        command=['python', 'Tools/Scripts/check-webkit-style'],
    215215                        )
    216216            + 0,
    … …  
    227227        self.expectRemoteCommands(
    228228            ExpectShell(workdir='wkdir',
    229                         command=['Tools/Scripts/check-webkit-style'],
     229                        command=['python', 'Tools/Scripts/check-webkit-style'],
    230230                        )
    231231            + 2,
    … …  
    242242        self.expectRemoteCommands(
    243243            ExpectShell(workdir='wkdir',
    244                         command=['Tools/Scripts/check-webkit-style'],
     244                        command=['python', 'Tools/Scripts/check-webkit-style'],
    245245                        )
    246246            + ExpectShell.log('stdio', stdout='''ERROR: Source/WebCore/layout/FloatingContext.cpp:36:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
    … …  
    264264        self.expectRemoteCommands(
    265265            ExpectShell(workdir='wkdir',
    266                         command=['Tools/Scripts/check-webkit-style'],
     266                        command=['python', 'Tools/Scripts/check-webkit-style'],
    267267                        )
    268268            + ExpectShell.log('stdio', stdout='Total errors found: 0 in 6 files')
    … …  
    280280        self.expectRemoteCommands(
    281281            ExpectShell(workdir='wkdir',
    282                         command=['Tools/Scripts/check-webkit-style'],
     282                        command=['python', 'Tools/Scripts/check-webkit-style'],
    283283                        )
    284284            + ExpectShell.log('stdio', stdout='Total errors found: 0 in 0 files')
    … …  
    304304                        timeout=300,
    305305                        logEnviron=False,
    306                         command=['Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
     306                        command=['python', 'Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
    307307                        logfiles={'json': self.jsonFileName},
    308308                        )
    … …  
    318318                        timeout=300,
    319319                        logEnviron=False,
    320                         command=['Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
     320                        command=['python', 'Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
    321321                        logfiles={'json': self.jsonFileName},
    322322                        )
    … …  
    341341            ExpectShell(workdir='wkdir',
    342342                        logEnviron=False,
    343                         command=['Tools/Scripts/test-webkitperl'],
     343                        command=['perl', 'Tools/Scripts/test-webkitperl'],
    344344                        timeout=120,
    345345                        )
    … …  
    354354            ExpectShell(workdir='wkdir',
    355355                        logEnviron=False,
    356                         command=['Tools/Scripts/test-webkitperl'],
     356                        command=['perl', 'Tools/Scripts/test-webkitperl'],
    357357                        timeout=120,
    358358                        )
    … …  
    381381            ExpectShell(workdir='wkdir',
    382382                        logEnviron=False,
    383                         command=['Tools/Scripts/test-webkitpy', '--json-output={0}'.format(self.jsonFileName)],
     383                        command=['python', 'Tools/Scripts/test-webkitpy', '--json-output={0}'.format(self.jsonFileName)],
    384384                        logfiles={'json': self.jsonFileName},
    385385                        timeout=120,
    … …  
    395395            ExpectShell(workdir='wkdir',
    396396                        logEnviron=False,
    397                         command=['Tools/Scripts/test-webkitpy', '--json-output={0}'.format(self.jsonFileName)],
     397                        command=['python', 'Tools/Scripts/test-webkitpy', '--json-output={0}'.format(self.jsonFileName)],
    398398                        logfiles={'json': self.jsonFileName},
    399399                        timeout=120,
    … …  
    10481048            ExpectShell(workdir='wkdir',
    10491049                        logEnviron=False,
    1050                         command=['Tools/Scripts/clean-webkit'],
     1050                        command=['python', 'Tools/Scripts/clean-webkit'],
    10511051                        )
    10521052            + 0,
    … …  
    10601060            ExpectShell(workdir='wkdir',
    10611061                        logEnviron=False,
    1062                         command=['Tools/Scripts/clean-webkit'],
     1062                        command=['python', 'Tools/Scripts/clean-webkit'],
    10631063                        )
    10641064            + ExpectShell.log('stdio', stdout='Unexpected failure.')
    … …  
    10841084            ExpectShell(workdir='wkdir',
    10851085                        logEnviron=False,
    1086                         command=['Tools/Scripts/clean-webkit'],
     1086                        command=['python', 'Tools/Scripts/clean-webkit'],
    10871087                        )
    10881088            + 0,
    … …  
    10981098            ExpectShell(workdir='wkdir',
    10991099                        logEnviron=False,
    1100                         command=['Tools/Scripts/clean-webkit'],
     1100                        command=['python', 'Tools/Scripts/clean-webkit'],
    11011101                        )
    11021102            + ExpectShell.log('stdio', stdout='Unexpected failure.')

  • trunk/Tools/ChangeLog

    r247301 r247305  
     12019-07-10  Aakash Jain  <aakash_jain@apple.com>
     2
     3        [ews-build] Explicitly use perl or python while invoking scripts
     4        https://bugs.webkit.org/show_bug.cgi?id=199669
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        * BuildSlaveSupport/ews-build/steps.py: Explicitly added perl or python while invoking scripts.
     9        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests accordingly.
     10
    1112019-07-10  Guillaume Emont  <guijemont@igalia.com>
    212
Note: See TracChangeset for help on using the changeset viewer.