Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (155371 => 155372)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2013-09-09 19:23:18 UTC (rev 155371)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2013-09-09 19:35:13 UTC (rev 155372)
@@ -151,7 +151,7 @@
"slavenames": ["apple-windows-3", "apple-windows-4"]
},
{
- "name": "GTK Linux 32-bit Release", "type": "BuildAndAPITest", "builddir": "gtk-linux-32-release",
+ "name": "GTK Linux 32-bit Release", "type": "BuildAndNonLayoutTest", "builddir": "gtk-linux-32-release",
"platform": "gtk", "configuration": "release", "architectures": ["i386"],
"slavenames": ["gtk-linux-slave-1"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (155371 => 155372)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-09-09 19:23:18 UTC (rev 155371)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-09-09 19:35:13 UTC (rev 155372)
@@ -760,21 +760,6 @@
self.addStep(UploadBuiltProduct())
self.addStep(trigger.Trigger(schedulerNames=triggers))
-class BuildAndAPITestFactory(Factory):
- def __init__(self, platform, configuration, architectures, triggers=None, SVNMirror=None):
- Factory.__init__(self, platform, configuration, architectures, True, SVNMirror)
- self.addStep(CompileWebKit())
- if triggers:
- self.addStep(ArchiveBuiltProduct())
- self.addStep(UploadBuiltProduct())
- self.addStep(trigger.Trigger(schedulerNames=triggers))
- if platform == "efl":
- self.addStep(RunEflAPITests)
- if platform == "gtk":
- self.addStep(RunGtkAPITests())
- if platform.startswith("qt"):
- self.addStep(RunQtAPITests)
-
def unitTestsSupported(configuration, platform):
if platform.startswith('mac') and configuration == "release":
return False; # https://bugs.webkit.org/show_bug.cgi?id=82652
@@ -784,23 +769,25 @@
return max(requests, key=operator.attrgetter("submittedAt"))
class TestFactory(Factory):
- TestClass = RunWebKitTests
+ LayoutTestClass = RunWebKitTests
ExtractTestResultsClass = ExtractTestResults
def __init__(self, platform, configuration, architectures, SVNMirror=None):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunJavaScriptCoreTests(buildJSCTool=False))
- self.addStep(self.TestClass(buildJSCTool=(platform != 'win')))
+ if self.LayoutTestClass:
+ self.addStep(self.LayoutTestClass(buildJSCTool=(platform != 'win')))
if unitTestsSupported(configuration, platform):
self.addStep(RunUnitTests())
self.addStep(RunPythonTests())
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
- self.addStep(ArchiveTestResults())
- self.addStep(UploadTestResults())
- self.addStep(self.ExtractTestResultsClass())
+ if self.LayoutTestClass:
+ self.addStep(ArchiveTestResults())
+ self.addStep(UploadTestResults())
+ self.addStep(self.ExtractTestResultsClass())
if platform == "efl":
self.addStep(RunEflAPITests)
if platform == "gtk":
@@ -810,21 +797,23 @@
class BuildAndTestFactory(Factory):
CompileClass = CompileWebKit
- TestClass = RunWebKitTests
+ LayoutTestClass = RunWebKitTests
ExtractTestResultsClass = ExtractTestResults
def __init__(self, platform, configuration, architectures, triggers=None, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
self.addStep(self.CompileClass())
self.addStep(RunJavaScriptCoreTests())
- self.addStep(self.TestClass())
+ if self.LayoutTestClass:
+ self.addStep(self.LayoutTestClass())
if unitTestsSupported(configuration, platform):
self.addStep(RunUnitTests())
self.addStep(RunPythonTests())
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
- self.addStep(ArchiveTestResults())
- self.addStep(UploadTestResults())
- self.addStep(self.ExtractTestResultsClass())
+ if self.LayoutTestClass:
+ self.addStep(ArchiveTestResults())
+ self.addStep(UploadTestResults())
+ self.addStep(self.ExtractTestResultsClass())
if platform == "efl":
self.addStep(RunEflAPITests())
if platform == "gtk":
@@ -838,22 +827,25 @@
class BuildAndTestWebKit2Factory(BuildAndTestFactory):
CompileClass = CompileWebKit
- TestClass = RunWebKit2Tests
+ LayoutTestClass = RunWebKit2Tests
class BuildAndTestWebKit1OnlyFactory(BuildAndTestFactory):
CompileClass = CompileWebKit1Only
class BuildAndTestWebKit2OnlyFactory(BuildAndTestFactory):
CompileClass = CompileWebKit2Only
- TestClass = RunWebKit2Tests
+ LayoutTestClass = RunWebKit2Tests
+class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
+ LayoutTestClass = None
+
class TestLeaksFactory(TestFactory):
- TestClass = RunWebKitLeakTests
+ LayoutTestClass = RunWebKitLeakTests
ExtractTestResultsClass = ExtractTestResultsAndLeaks
class TestWebKit2Factory(TestFactory):
- TestClass = RunWebKit2Tests
+ LayoutTestClass = RunWebKit2Tests
class BuildAndPerfTestFactory(Factory):
def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
Modified: trunk/Tools/ChangeLog (155371 => 155372)
--- trunk/Tools/ChangeLog 2013-09-09 19:23:18 UTC (rev 155371)
+++ trunk/Tools/ChangeLog 2013-09-09 19:35:13 UTC (rev 155372)
@@ -1,3 +1,34 @@
+2013-09-09 Zan Dobersek <[email protected]>
+
+ [GTK] 32-bit builder should run the JSC tests
+ https://bugs.webkit.org/show_bug.cgi?id=119215
+
+ Reviewed by Philippe Normand.
+
+ Rename the TestClass member of the TestFactory and BuildAndTestFactory classes
+ to a more descriptive name, 'LayoutTestClass'. In these two factory classes, the layout testing-specific
+ steps are only added if the LayoutTestClass member was not overridden to the value of None in a
+ derived class.
+
+ Remove the BuildAndAPITestFactory class and replace it with the BuildAndNonLayoutTestFactory class that
+ is derived from the BuildAndTestFactory class and overrides the LayoutTestClass member to the value of None.
+ This allows for builders of the BuildAndNonLayoutTest type to run all but the layout tests. This type
+ is currently used by the GTK 32-bit builder - there's at the moment no interest to have the builder cover
+ layout testing while other types of testing are still expected to be performed.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (BuildFactory.__init__):
+ (TestFactory):
+ (TestFactory.__init__):
+ (BuildAndTestFactory):
+ (BuildAndTestFactory.__init__):
+ (BuildAndTestWebKit2Factory):
+ (BuildAndTestWebKit2OnlyFactory):
+ (BuildAndNonLayoutTestFactory):
+ (TestLeaksFactory):
+ (TestWebKit2Factory):
+
2013-09-09 Manuel Rego Casasnovas <[email protected]>
Unreviewed. Add myself as a committer.
