Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (261183 => 261184)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-05-05 18:26:23 UTC (rev 261183)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-05-05 18:34:21 UTC (rev 261184)
@@ -171,7 +171,7 @@
class WindowsFactory(Factory):
def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
- Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, triggers=triggers, additionalArguments=additionalArguments)
+ Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, triggers=triggers, additionalArguments=additionalArguments, checkRelevance=True)
self.addStep(KillOldProcesses())
self.addStep(CompileWebKit(skipUpload=True))
self.addStep(ValidatePatch(verifyBugClosed=False, addURLs=False))
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py (261183 => 261184)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py 2020-05-05 18:26:23 UTC (rev 261183)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py 2020-05-05 18:34:21 UTC (rev 261184)
@@ -161,6 +161,7 @@
factory = factories.WindowsFactory(platform='win', configuration='release', architectures=["x86_64"])
self.assertBuildSteps(factory.steps, [
_BuildStepFactory(steps.ConfigureBuild, platform='win', configuration='release', architectures=["x86_64"], buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
+ _BuildStepFactory(steps.CheckPatchRelevance),
_BuildStepFactory(steps.ValidatePatch),
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CheckOutSource),
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (261183 => 261184)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-05-05 18:26:23 UTC (rev 261183)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-05-05 18:34:21 UTC (rev 261184)
@@ -304,6 +304,7 @@
'jsc': jsc_paths,
'webkitpy': webkitpy_paths,
'wk1-tests': wk1_paths,
+ 'windows': wk1_paths,
}
def _patch_is_relevant(self, patch, builderName):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (261183 => 261184)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-05-05 18:26:23 UTC (rev 261183)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-05-05 18:34:21 UTC (rev 261184)
@@ -2216,17 +2216,25 @@
self.expectOutcome(result=SUCCESS, state_string='Patch contains relevant changes')
return self.runStep()
+ def test_relevant_windows_wk1_patch(self):
+ CheckPatchRelevance._get_patch = lambda x: 'Sample patch; file: Source/WebKitLegacy'
+ self.setupStep(CheckPatchRelevance())
+ self.setProperty('buildername', 'Windows-EWS')
+ self.expectOutcome(result=SUCCESS, state_string='Patch contains relevant changes')
+ return self.runStep()
+
def test_queues_without_relevance_info(self):
CheckPatchRelevance._get_patch = lambda x: 'Sample patch'
queues = ['Commit-Queue', 'Style-EWS', 'Apply-WatchList-EWS', 'GTK-Build-EWS', 'GTK-WK2-Tests-EWS',
'iOS-13-Build-EWS', 'iOS-13-Simulator-Build-EWS', 'iOS-13-Simulator-WK2-Tests-EWS',
'macOS-Mojave-Release-Build-EWS', 'macOS-Mojave-Release-WK2-Tests-EWS', 'macOS-Mojave-Debug-Build-EWS',
- 'Windows-EWS', 'WinCairo-EWS', 'WPE-EWS', 'WebKitPerl-Tests-EWS']
+ 'WinCairo-EWS', 'WPE-EWS', 'WebKitPerl-Tests-EWS']
for queue in queues:
self.setupStep(CheckPatchRelevance())
self.setProperty('buildername', queue)
self.expectOutcome(result=SUCCESS, state_string='Patch contains relevant changes')
- return self.runStep()
+ rc = self.runStep()
+ return rc
def test_non_relevant_patch(self):
CheckPatchRelevance._get_patch = lambda x: 'Sample patch'
Modified: trunk/Tools/ChangeLog (261183 => 261184)
--- trunk/Tools/ChangeLog 2020-05-05 18:26:23 UTC (rev 261183)
+++ trunk/Tools/ChangeLog 2020-05-05 18:34:21 UTC (rev 261184)
@@ -1,3 +1,19 @@
+2020-05-05 Aakash Jain <aakash_j...@apple.com>
+
+ EWS should skip Apple Win build and tests for patches that only change WebKit2 sources
+ https://bugs.webkit.org/show_bug.cgi?id=211210
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/factories.py:
+ (WindowsFactory.__init__): enabled relevance checking for windows ews.
+ * BuildSlaveSupport/ews-build/factories_unittest.py: Updated unit-test.
+ * BuildSlaveSupport/ews-build/steps.py:
+ (CheckPatchRelevance): Defined relevance info for windows ews.
+ * BuildSlaveSupport/ews-build/steps_unittest.py:
+ (TestCheckPatchRelevance.test_relevant_windows_wk1_patch): Added unit test.
+ (TestCheckPatchRelevance.test_queues_without_relevance_info): Fixed unit-test.
+
2020-05-05 Mark Lam <mark....@apple.com>
Allow Bitmap to use up to a UCPURegister word size for internal bit storage.
