Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (234784 => 234785)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-08-11 21:04:12 UTC (rev 234784)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-08-12 04:13:52 UTC (rev 234785)
@@ -117,6 +117,14 @@
"platform": "mac-high-sierra"
},
{
+ "name": "ews121",
+ "platform": "ios-simulator-11"
+ },
+ {
+ "name": "ews122",
+ "platform": "ios-simulator-11"
+ },
+ {
"name": "ews123",
"platform": "ios-simulator-11"
},
@@ -191,8 +199,8 @@
"workernames": ["tanty-gtk-wk2-ews", "ltilve-gtk-wk2-ews"]
},
{
- "name": "iOS-11-EWS",
- "factory": "iOSFactory",
+ "name": "iOS-11-Build-EWS",
+ "factory": "iOSBuildFactory",
"platform": "ios-11",
"configuration": "release",
"architectures": ["arm64"],
@@ -199,15 +207,23 @@
"workernames": ["ews108", "ews109"]
},
{
- "name": "iOS-11-Simulator-EWS",
- "factory": "iOSSimulatorFactory",
+ "name": "iOS-11-Simulator-Build-EWS",
+ "factory": "iOSBuildFactory",
"platform": "ios-simulator-11",
"configuration": "release",
"architectures": ["x86_64"],
- "triggers": ["api-tests-ios-sim-ews"],
- "workernames": ["ews123", "ews124", "ews125", "ews126"]
+ "triggers": ["api-tests-ios-sim-ews", "ios-11-sim-tests-ews"],
+ "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
},
{
+ "name": "iOS-11-Simulator-Tests-EWS",
+ "factory": "iOSTestsFactory",
+ "platform": "ios-simulator-11",
+ "configuration": "release",
+ "architectures": ["x86_64"],
+ "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
+ },
+ {
"name": "macOS-Sierra-Release-WK1-EWS",
"factory": "MacWK1Factory",
"platform": "mac-sierra",
@@ -302,15 +318,22 @@
"name": "try",
"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",
+ "macOS-High-Sierra-Release-32bit-WK2-EWS", "WPE-EWS", "Windows-EWS", "iOS-11-Build-EWS", "WinCairo-EWS", "iOS-11-Simulator-Build-EWS",
"WebKitPy-Tests-EWS", "WebKitPerl-Tests-EWS", "macOS-Sierra-Debug-WK1-EWS", "Bindings-Tests-EWS"]
},
{
"type": "Triggerable",
+ "name": "ios-11-sim-tests-ews",
+ "builderNames": [
+ "iOS-11-Simulator-Tests-EWS"
+ ]
+ },
+ {
+ "type": "Triggerable",
"name": "api-tests-ios-sim-ews",
"builderNames": [
"API-Tests-iOS-Simulator-EWS"
- ]
+ ]
},
{
"type": "Triggerable",
@@ -317,7 +340,7 @@
"name": "api-tests-mac-ews",
"builderNames": [
"API-Tests-macOS-EWS"
- ]
+ ]
}
]
}
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (234784 => 234785)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2018-08-11 21:04:12 UTC (rev 234784)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2018-08-12 04:13:52 UTC (rev 234785)
@@ -85,6 +85,23 @@
}
+class TestFactory(Factory):
+ LayoutTestClass = None
+ APITestClass = None
+
+ def getProduct(self):
+ self.addStep(DownloadBuiltProduct())
+ self.addStep(ExtractBuiltProduct())
+
+ def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
+ self.getProduct()
+ if self.LayoutTestClass:
+ self.addStep(self.LayoutTestClass())
+ if self.APITestClass:
+ self.addStep(self.APITestClass())
+
+
class JSCTestsFactory(Factory):
def __init__(self, platform, configuration='release', architectures=None, additionalArguments=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
@@ -98,29 +115,20 @@
self.addStep(RunJavaScriptCoreTestsToT())
-class APITestsFactory(Factory):
- def getProduct(self):
- self.addStep(DownloadBuiltProduct())
- self.addStep(ExtractBuiltProduct())
+class APITestsFactory(TestFactory):
+ APITestClass = RunAPITests
- def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
- self.getProduct()
- self.addStep(RunAPITests())
-
class GTKFactory(Factory):
pass
-class iOSFactory(BuildFactory):
+class iOSBuildFactory(BuildFactory):
pass
-class iOSSimulatorFactory(BuildFactory):
- def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, triggers=None, **kwargs):
- BuildFactory.__init__(self, platform, configuration, architectures, additionalArguments, triggers)
- self.addStep(RunWebKitTests())
+class iOSTestsFactory(TestFactory):
+ LayoutTestClass = RunWebKitTests
class MacWK1Factory(BuildFactory):