Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (180998 => 180999)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-04 14:19:47 UTC (rev 180998)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-04 15:52:13 UTC (rev 180999)
@@ -780,11 +780,14 @@
class TestFactory(Factory):
JSCTestClass = RunJavaScriptCoreTests
LayoutTestClass = RunWebKitTests
- ExtractTestResultsClass = ExtractTestResults
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
+
+ def getProduct(self):
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
+
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
+ self.getProduct()
if self.JSCTestClass:
self.addStep(self.JSCTestClass())
if self.LayoutTestClass:
@@ -798,35 +801,19 @@
if self.LayoutTestClass:
self.addStep(ArchiveTestResults())
self.addStep(UploadTestResults())
- self.addStep(self.ExtractTestResultsClass())
+ self.addStep(ExtractTestResults())
if platform == "efl":
- self.addStep(RunEflAPITests)
+ self.addStep(RunEflAPITests())
if platform == "gtk":
self.addStep(RunGtkAPITests())
self.addStep(RunGtkWebKitGObjectDOMBindingsAPIBreakTests())
-class BuildAndTestFactory(Factory):
- CompileClass = CompileWebKit
- LayoutTestClass = RunWebKitTests
- ExtractTestResultsClass = ExtractTestResults
+class BuildAndTestFactory(TestFactory):
+ def getProduct(self):
+ self.addStep(CompileWebKit())
+
def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
- self.addStep(self.CompileClass())
- self.addStep(RunJavaScriptCoreTests())
- if self.LayoutTestClass:
- self.addStep(self.LayoutTestClass())
- self.addStep(RunPythonTests())
- self.addStep(RunPerlTests())
- self.addStep(RunBindingsTests())
- if self.LayoutTestClass:
- self.addStep(ArchiveTestResults())
- self.addStep(UploadTestResults())
- self.addStep(self.ExtractTestResultsClass())
- if platform == "efl":
- self.addStep(RunEflAPITests())
- if platform == "gtk":
- self.addStep(RunGtkAPITests())
- self.addStep(RunGtkWebKitGObjectDOMBindingsAPIBreakTests())
+ TestFactory.__init__(self, platform, configuration, architectures, additionalArguments, SVNMirror, **kwargs)
if triggers:
self.addStep(ArchiveBuiltProduct())
self.addStep(UploadBuiltProduct())
@@ -844,10 +831,6 @@
self.addStep(Compile32bitJSC())
self.addStep(Run32bitJSCTests())
-class BuildAndTestWebKit2Factory(BuildAndTestFactory):
- CompileClass = CompileWebKit
- LayoutTestClass = RunWebKit2Tests
-
class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
LayoutTestClass = None
Modified: trunk/Tools/ChangeLog (180998 => 180999)
--- trunk/Tools/ChangeLog 2015-03-04 14:19:47 UTC (rev 180998)
+++ trunk/Tools/ChangeLog 2015-03-04 15:52:13 UTC (rev 180999)
@@ -1,3 +1,19 @@
+2015-03-04 Matthew Mirman <mmir...@apple.com>
+
+ Cleaned up BuildAndTestFactory to not be a near duplicate of TestFactory
+ https://bugs.webkit.org/show_bug.cgi?id=142230
+
+ Reviewed by Csaba Osztrogonác.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (TestFactory):
+ (TestFactory.getProduct): Added
+ (TestFactory.__init__): moved downloader to getProduct
+ (BuildAndTestFactory):
+ (BuildAndTestFactory.getProduct): Added
+ (BuildAndTestFactory.__init__): made to call TestFactory.__init__ and append steps to the end.
+ (BuildAndTestWebKit2Factory): Deleted. Wasn't used anywhere.
+
2015-03-04 Debarshi Ray <debars...@gnome.org>
[GTK] WebView should hold a reference on WebContext because non-default contexts are a reality
