Changeset 246823 in webkit

Timestamp:

Jun 25, 2019 6:01:01 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] Retry Layout test in case of failures
​https://bugs.webkit.org/show_bug.cgi?id=199194

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py:

(RunWebKitTests.evaluateCommand): Check if tests failed and retry them if required.
(ReRunWebKitTests): Build step to re-run layout tests.
(ReRunWebKitTests.evaluateCommand): Check if tests failed and retry on clean build if required.
(RunWebKitTestsWithoutPatch): Build step to run tests without patch.
(RunWebKitTestsWithoutPatch.evaluateCommand):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

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

@@ -798 +798 @@
             self.build.buildFinished([message], SUCCESS)
         else:
-            self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(), ExtractTestResults()])
+            self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(), ExtractTestResults(), ReRunWebKitTests()])
         return rc
+
+
+class ReRunWebKitTests(RunWebKitTests):
+    name = 're-run-layout-tests'
+
+    def evaluateCommand(self, cmd):
+        rc = shell.Test.evaluateCommand(self, cmd)
+        if rc == SUCCESS:
+            message = 'Passed layout tests'
+            self.descriptionDone = message
+            self.build.results = SUCCESS
+            self.build.buildFinished([message], SUCCESS)
+        else:
+            self.setProperty('patchFailedTests', True)
+            self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(identifier='rerun'), ExtractTestResults(identifier='rerun'), UnApplyPatchIfRequired(), CompileWebKitToT(), RunWebKitTestsWithoutPatch()])
+        return rc
+
+
+class RunWebKitTestsWithoutPatch(RunWebKitTests):
+    name = 'run-layout-tests-without-patch'
+
+    def evaluateCommand(self, cmd):
+        rc = shell.Test.evaluateCommand(self, cmd)
+        self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(identifier='clean-tree'), ExtractTestResults(identifier='clean-tree')])
+        return rc
+
 
 class RunWebKit1Tests(RunWebKitTests):

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-25  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Retry Layout test in case of failures
+        https://bugs.webkit.org/show_bug.cgi?id=199194
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (RunWebKitTests.evaluateCommand): Check if tests failed and retry them if required.
+        (ReRunWebKitTests): Build step to re-run layout tests.
+        (ReRunWebKitTests.evaluateCommand): Check if tests failed and retry on clean build if required.
+        (RunWebKitTestsWithoutPatch): Build step to run tests without patch.
+        (RunWebKitTestsWithoutPatch.evaluateCommand):
+
 2019-06-25  Aakash Jain  <aakash_jain@apple.com>