Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (166607 => 166608)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-04-01 20:47:18 UTC (rev 166607)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-04-01 21:09:04 UTC (rev 166608)
@@ -13,6 +13,7 @@
{ "name": "apple-mini-210", "platform": "mac-mountainlion"},
{ "name": "apple-mini-218", "platform": "mac-mountainlion"},
+ { "name": "apple-mac-114", "platform": "mac-mavericks"},
{ "name": "apple-mini-129", "platform": "mac-mavericks"},
{ "name": "apple-mini-130", "platform": "mac-mavericks"},
{ "name": "apple-mini-137", "platform": "mac-mavericks"},
@@ -99,6 +100,10 @@
"platform": "mac-mavericks", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["apple-mini-180"]
},
+ { "name": "Apple Mavericks 32-bit JSC (BuildAndTest)", "type": "BuildAndTest32bitJSC", "builddir": "mavericks-32bitJSC-debug",
+ "platform": "mac-mavericks", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["apple-mac-114"]
+ },
{ "name": "Apple Mavericks Release (Build)", "type": "Build", "builddir": "mavericks-release",
"platform": "mac-mavericks", "configuration": "release", "architectures": ["x86_64"],
"triggers": ["mavericks-release-tests-wk1", "mavericks-release-tests-wk2", "mavericks-release-perf"],
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (166607 => 166608)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-04-01 20:47:18 UTC (rev 166607)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-04-01 21:09:04 UTC (rev 166608)
@@ -233,6 +233,8 @@
class CompileLLINTCLoop(CompileWebKit):
command = ["perl", "./Tools/Scripts/build-jsc", "--cloop", WithProperties("--%(configuration)s")]
+class Compile32bitJSC(CompileWebKit):
+ command = ["perl", "./Tools/Scripts/build-jsc", "--32-bit", WithProperties("--%(configuration)s")]
class CompileWebKit1Only(CompileWebKit):
command = ["perl", "./Tools/Scripts/build-webkit", "--no-webkit2", WithProperties("--%(configuration)s")]
@@ -562,6 +564,25 @@
return 0
+class Run32bitJSCTests(TestWithFailureCount):
+ name = "webkit-32bit-jsc-test"
+ description = ["32bit-jsc-tests running"]
+ descriptionDone = ["32bit-jsc-tests"]
+ command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", "--32-bit", "--no-build", WithProperties("--%(configuration)s")]
+ failedTestsFormatString = "%d regressions found."
+
+ def countFailures(self, cmd):
+ logText = cmd.logs['stdio'].getText()
+ # We're looking for the line that looks like this: 0 regressions found.\n0 tests fixed.
+ regex = re.compile(r'(?P<count>\d+) regressions found.')
+ for line in logText.splitlines():
+ match = regex.match(line)
+ if not match:
+ continue
+ return int(match.group('count'))
+ return 0
+
+
class RunBindingsTests(shell.Test):
name = "bindings-generation-tests"
description = ["bindings-tests running"]
@@ -862,6 +883,12 @@
self.addStep(CompileLLINTCLoop())
self.addStep(RunLLINTCLoopTests())
+class BuildAndTest32bitJSCFactory(Factory):
+ 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(Compile32bitJSC())
+ self.addStep(Run32bitJSCTests())
+
class BuildAndTestWebKit2Factory(BuildAndTestFactory):
CompileClass = CompileWebKit
LayoutTestClass = RunWebKit2Tests
Modified: trunk/Tools/ChangeLog (166607 => 166608)
--- trunk/Tools/ChangeLog 2014-04-01 20:47:18 UTC (rev 166607)
+++ trunk/Tools/ChangeLog 2014-04-01 21:09:04 UTC (rev 166608)
@@ -1,3 +1,18 @@
+2014-04-01 Lucas Forschler <lforsch...@apple.com>
+
+ Add a 32bit JSC builder/tester.
+ https://bugs.webkit.org/show_bug.cgi?id=131054
+
+ Reviewed by Michael Saboff.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (Compile32bitJSC):
+ (Run32bitJSCTests):
+ (Run32bitJSCTests.countFailures):
+ (BuildAndTest32bitJSCFactory):
+ (BuildAndTest32bitJSCFactory.__init__):
+
2014-04-01 Martin Robinson <mrobin...@igalia.com>
[GTK] No longer build WebKit1 gtkdoc
