Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (233470 => 233471)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-07-03 18:51:33 UTC (rev 233470)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-07-03 18:59:28 UTC (rev 233471)
@@ -134,11 +134,11 @@
},
{
"name": "ews127",
- "platform": "*"
+ "platform": "jsc-only"
},
{
"name": "ews128",
- "platform": "*"
+ "platform": "jsc-only"
},
{
"name": "ews200",
@@ -257,9 +257,10 @@
"workernames": ["igalia-wpe-ews", "aperez-wpe-gcc5-ews", "aperez-wpe-gcc6-ews"]
},
{
- "name": "JSC-tests-EWS",
+ "name": "JSC-Tests-EWS",
"factory": "JSCTestsFactory",
- "platform": "*",
+ "platform": "jsc-only",
+ "configuration": "release",
"workernames": ["ews127", "ews128"]
},
{
@@ -286,7 +287,7 @@
"type": "Try_Userpass",
"name": "try",
"port": 5555,
- "builderNames": ["Style-EWS", "JSC-tests-EWS", "macOS-Sierra-Release-WK1-EWS", "GTK-Webkit2-EWS", "macOS-Sierra-Release-WK2-EWS",
+ "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"]
}
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (233470 => 233471)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2018-07-03 18:51:33 UTC (rev 233470)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2018-07-03 18:59:28 UTC (rev 233471)
@@ -65,6 +65,12 @@
self.addStep(CompileWebKit())
+class JSCTestsFactory(Factory):
+ def __init__(self, platform, configuration='release', architectures=None, additionalArguments=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
+ self.addStep(CompileJSCOnly())
+
+
class GTKFactory(Factory):
pass
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (233470 => 233471)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2018-07-03 18:51:33 UTC (rev 233470)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2018-07-03 18:59:28 UTC (rev 233471)
@@ -117,8 +117,8 @@
class CompileWebKit(shell.Compile):
name = "compile-webkit"
- description = ["compiling webkit"]
- descriptionDone = ["compiled webkit"]
+ description = ["compiling"]
+ descriptionDone = ["compiled"]
env = {'MFLAGS': ''}
warningPattern = ".*arning: .*"
command = ["perl", "Tools/Scripts/build-webkit", WithProperties("--%(configuration)s")]
@@ -147,6 +147,11 @@
return shell.Compile.start(self)
+class CompileJSCOnly(CompileWebKit):
+ name = "build-jsc"
+ command = ["perl", "Tools/Scripts/build-jsc", WithProperties("--%(configuration)s")]
+
+
class CleanBuild(shell.Compile):
name = "delete-WebKitBuild-directory"
description = ["deleting WebKitBuild directory"]
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (233470 => 233471)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-07-03 18:51:33 UTC (rev 233470)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-07-03 18:59:28 UTC (rev 233471)
@@ -420,7 +420,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='compiled webkit')
+ self.expectOutcome(result=SUCCESS, state_string='compiled')
return self.runStep()
def test_failure(self):
@@ -434,9 +434,45 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='compiled webkit (failure)')
+ self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
return self.runStep()
+class TestCompileJSCOnly(BuildStepMixinAdditions, unittest.TestCase):
+ def setUp(self):
+ self.longMessage = True
+ return self.setUpBuildStep()
+
+ def tearDown(self):
+ return self.tearDownBuildStep()
+
+ def test_success(self):
+ self.setupStep(CompileJSCOnly())
+ self.setProperty('fullPlatform', 'jsc-only')
+ self.setProperty('configuration', 'release')
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ command=["perl", "Tools/Scripts/build-jsc", '--release'],
+ )
+ + 0,
+ )
+ self.expectOutcome(result=SUCCESS, state_string='compiled')
+ return self.runStep()
+
+ def test_failure(self):
+ self.setupStep(CompileJSCOnly())
+ self.setProperty('fullPlatform', 'jsc-only')
+ self.setProperty('configuration', 'debug')
+ self.expectRemoteCommands(
+ ExpectShell(workdir='wkdir',
+ command=["perl", "Tools/Scripts/build-jsc", '--debug'],
+ )
+ + ExpectShell.log('stdio', stdout='1 error generated.')
+ + 2,
+ )
+ self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+ return self.runStep()
+
+
if __name__ == '__main__':
unittest.main()
Modified: trunk/Tools/ChangeLog (233470 => 233471)
--- trunk/Tools/ChangeLog 2018-07-03 18:51:33 UTC (rev 233470)
+++ trunk/Tools/ChangeLog 2018-07-03 18:59:28 UTC (rev 233471)
@@ -1,3 +1,17 @@
+2018-07-03 Aakash Jain <[email protected]>
+
+ [ews-build] Add support for JSC-Tests-EWS
+ https://bugs.webkit.org/show_bug.cgi?id=187201
+
+ Reviewed by Lucas Forschler.
+
+ * BuildSlaveSupport/ews-build/factories.py:
+ (JSCTestsFactory): Added JSCTestsFactory.
+ * BuildSlaveSupport/ews-build/steps.py:
+ (CompileJSCOnly): Command to compile JSC.
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+ * BuildSlaveSupport/ews-build/config.json: Changed platform to jsc-only. This matches with build.webkit.org configuration.
+
2018-07-03 Zalan Bujtas <[email protected]>
[LFC] Add test-list file for regression testing
