Attachment 372841 Details for Bug 199193 – Patch

[patch] Patch

bug-199193-20190625134418.patch (text/plain), 6.17 KB, created by Aakash Jain on 2019-06-25 10:44:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2019-06-25 10:44:20 PDT

Size: 6.17 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246795)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-25  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] Combine various patchFailed*Tests properties
>+        https://bugs.webkit.org/show_bug.cgi?id=199193
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2019-06-25  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] UploadTestResults and ExtractTestResults clobber results in case of multiple layout test runs in a build
>Index: Tools/BuildSlaveSupport/ews-build/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps.py	(revision 246795)
>+++ Tools/BuildSlaveSupport/ews-build/steps.py	(working copy)
>@@ -401,7 +401,7 @@ class UnApplyPatchIfRequired(CleanWorkin
>     descriptionDone = ['Unapplied patch']
> 
>     def doStepIf(self, step):
>-        return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedJSCTests') or self.getProperty('patchFailedAPITests')
>+        return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedTests')
> 
>     def hideStepIf(self, results, step):
>         return not self.doStepIf(step)
>@@ -647,7 +647,7 @@ class CompileWebKitToT(CompileWebKit):
>     haltOnFailure = False
> 
>     def doStepIf(self, step):
>-        return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedAPITests')
>+        return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedTests')
> 
>     def hideStepIf(self, results, step):
>         return not self.doStepIf(step)
>@@ -716,7 +716,7 @@ class RunJavaScriptCoreTests(shell.Test)
> 
>     def evaluateCommand(self, cmd):
>         if cmd.didFail():
>-            self.setProperty('patchFailedJSCTests', True)
>+            self.setProperty('patchFailedTests', True)
> 
>         return super(RunJavaScriptCoreTests, self).evaluateCommand(cmd)
> 
>@@ -725,13 +725,13 @@ class ReRunJavaScriptCoreTests(RunJavaSc
>     name = 'jscore-test-rerun'
> 
>     def doStepIf(self, step):
>-        return self.getProperty('patchFailedJSCTests')
>+        return self.getProperty('patchFailedTests')
> 
>     def hideStepIf(self, results, step):
>         return not self.doStepIf(step)
> 
>     def evaluateCommand(self, cmd):
>-        self.setProperty('patchFailedJSCTests', cmd.didFail())
>+        self.setProperty('patchFailedTests', cmd.didFail())
>         return super(RunJavaScriptCoreTests, self).evaluateCommand(cmd)
> 
> 
>@@ -741,7 +741,7 @@ class RunJavaScriptCoreTestsToT(RunJavaS
>     command = ['perl', 'Tools/Scripts/run-javascriptcore-tests', '--no-fail-fast', '--json-output={0}'.format(jsonFileName), WithProperties('--%(configuration)s')]
> 
>     def doStepIf(self, step):
>-        return self.getProperty('patchFailedJSCTests')
>+        return self.getProperty('patchFailedTests')
> 
>     def hideStepIf(self, results, step):
>         return not self.doStepIf(step)
>@@ -950,7 +950,7 @@ class ReRunAPITests(RunAPITests):
>             self.build.results = SUCCESS
>             self.build.buildFinished([message], SUCCESS)
>         else:
>-            self.setProperty('patchFailedAPITests', True)
>+            self.setProperty('patchFailedTests', True)
>             self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileWebKitToT(), RunAPITestsWithoutPatch(), AnalyzeAPITestsResults()])
>         return rc
> 
>Index: Tools/BuildSlaveSupport/ews-build/steps_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(revision 246795)
>+++ Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(working copy)
>@@ -713,7 +713,7 @@ class TestReRunJavaScriptCoreTests(Build
>         self.setupStep(ReRunJavaScriptCoreTests())
>         self.setProperty('fullPlatform', 'jsc-only')
>         self.setProperty('configuration', 'release')
>-        self.setProperty('patchFailedJSCTests', 'True')
>+        self.setProperty('patchFailedTests', 'True')
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>                         command=['perl', 'Tools/Scripts/run-javascriptcore-tests', '--no-build', '--no-fail-fast', '--json-output={0}'.format(self.jsonFileName), '--release'],
>@@ -728,7 +728,7 @@ class TestReRunJavaScriptCoreTests(Build
>         self.setupStep(ReRunJavaScriptCoreTests())
>         self.setProperty('fullPlatform', 'jsc-only')
>         self.setProperty('configuration', 'debug')
>-        self.setProperty('patchFailedJSCTests', 'True')
>+        self.setProperty('patchFailedTests', 'True')
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>                         command=['perl', 'Tools/Scripts/run-javascriptcore-tests', '--no-build', '--no-fail-fast', '--json-output={0}'.format(self.jsonFileName), '--debug'],
>@@ -762,7 +762,7 @@ class TestRunJavaScriptCoreTestsToT(Buil
>         self.setupStep(RunJavaScriptCoreTestsToT())
>         self.setProperty('fullPlatform', 'jsc-only')
>         self.setProperty('configuration', 'release')
>-        self.setProperty('patchFailedJSCTests', 'True')
>+        self.setProperty('patchFailedTests', 'True')
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>                         command=['perl', 'Tools/Scripts/run-javascriptcore-tests', '--no-fail-fast', '--json-output={0}'.format(self.jsonFileName), '--release'],
>@@ -777,7 +777,7 @@ class TestRunJavaScriptCoreTestsToT(Buil
>         self.setupStep(RunJavaScriptCoreTestsToT())
>         self.setProperty('fullPlatform', 'jsc-only')
>         self.setProperty('configuration', 'debug')
>-        self.setProperty('patchFailedJSCTests', 'True')
>+        self.setProperty('patchFailedTests', 'True')
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>                         command=['perl', 'Tools/Scripts/run-javascriptcore-tests', '--no-fail-fast', '--json-output={0}'.format(self.jsonFileName), '--debug'],

Actions: View | Formatted Diff | Diff

Attachments on bug 199193: 372841 | 372883