Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (233317 => 233318)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-06-28 19:42:24 UTC (rev 233317)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-06-28 19:52:32 UTC (rev 233318)
@@ -269,8 +269,8 @@
"workernames": ["webkit-misc"]
},
{
- "name": "Webkitpy-tests-EWS",
- "factory": "WebkitpyFactory",
+ "name": "WebKitPy-Tests-EWS",
+ "factory": "WebKitPyFactory",
"platform": "*",
"workernames": ["webkit-misc"]
},
@@ -288,7 +288,7 @@
"port": 5555,
"builderNames": ["Style-EWS", "JSC-tests-EWS", "macOS-Sierra-Release-WK1-EWS", "GTK-Webkit2-EWS", "macOS-Sierra-Release-WK2-EWS",
"macOS-High-Sierra-Release-32bit-WK2-EWS", "WPE-EWS", "Windows-EWS", "iOS-11-EWS", "WinCairo-EWS", "iOS-11-Simulator-EWS",
- "Webkitpy-tests-EWS", "WebKitPerl-Tests-EWS", "macOS-Sierra-Debug-WK1-EWS", "Bindings-tests-EWS"]
+ "WebKitPy-Tests-EWS", "WebKitPerl-Tests-EWS", "macOS-Sierra-Debug-WK1-EWS", "Bindings-tests-EWS"]
}
]
}
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (233317 => 233318)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2018-06-28 19:42:24 UTC (rev 233317)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2018-06-28 19:52:32 UTC (rev 233318)
@@ -51,6 +51,12 @@
self.addStep(RunWebKitPerlTests())
+class WebKitPyFactory(Factory):
+ def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
+ self.addStep(RunWebKitPyTests())
+
+
class BuildFactory(Factory):
def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
@@ -93,7 +99,3 @@
class JSCTestsFactory(Factory):
pass
-
-
-class WebkitpyFactory(Factory):
- pass
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (233317 => 233318)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2018-06-28 19:42:24 UTC (rev 233317)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2018-06-28 19:52:32 UTC (rev 233318)
@@ -90,6 +90,14 @@
command = ['Tools/Scripts/test-webkitperl']
+class RunWebKitPyTests(shell.ShellCommand):
+ name = 'webkitpy-tests'
+ description = ['webkitpy-tests running']
+ descriptionDone = ['webkitpy-tests']
+ flunkOnFailure = True
+ command = ['Tools/Scripts/test-webkitpy']
+
+
def appendCustomBuildFlags(step, platform, fullPlatform):
# FIXME: Make a common 'supported platforms' list.
if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only', 'wpe'):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (233317 => 233318)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-06-28 19:42:24 UTC (rev 233317)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-06-28 19:52:32 UTC (rev 233318)
@@ -295,6 +295,39 @@
return self.runStep()
+class TestWebKitPyTests(BuildStepMixinAdditions, unittest.TestCase):
+ def setUp(self):
+ self.longMessage = True
+ return self.setUpBuildStep()
+
+ def tearDown(self):
+ return self.tearDownBuildStep()
+
+ def test_success(self):
+ self.setupStep(RunWebKitPyTests())
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ command=['Tools/Scripts/test-webkitpy'],
+ )
+ + 0,
+ )
+ self.expectOutcome(result=SUCCESS, state_string='webkitpy-tests')
+ return self.runStep()
+
+ def test_failure(self):
+ self.setupStep(RunWebKitPyTests())
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ command=['Tools/Scripts/test-webkitpy'],
+ )
+ + ExpectShell.log('stdio', stdout='''Ran 1744 tests in 5.913s
+FAILED (failures=1, errors=0)''')
+ + 2,
+ )
+ self.expectOutcome(result=FAILURE, state_string='webkitpy-tests (failure)')
+ return self.runStep()
+
+
class TestKillOldProcesses(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (233317 => 233318)
--- trunk/Tools/ChangeLog 2018-06-28 19:42:24 UTC (rev 233317)
+++ trunk/Tools/ChangeLog 2018-06-28 19:52:32 UTC (rev 233318)
@@ -1,3 +1,15 @@
+2018-06-28 Aakash Jain <aakash_j...@apple.com>
+
+ [ews-build] Add support for WebKitPy-Tests-EWS
+ https://bugs.webkit.org/show_bug.cgi?id=187148
+
+ Reviewed by Lucas Forschler.
+
+ * BuildSlaveSupport/ews-build/factories.py: Added WebKitPyFactory.
+ * BuildSlaveSupport/ews-build/steps.py: Added build step RunWebKitPyTests.
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
+ * BuildSlaveSupport/ews-build/config.json: Updated to use CamelCase.
+
2018-06-28 Daniel Bates <daba...@apple.com>
Fix the iOS build following r233299
