Commit 7fcf10b8 authored by ossy@webkit.org's avatar ossy@webkit.org
Browse files

master.cfg fine-tuning for Qt Mountain Lion Release bot

https://bugs.webkit.org/show_bug.cgi?id=113191

Reviewed by Ryosuke Niwa.

* BuildSlaveSupport/build.webkit.org-config/config.json:
  - Rename the slave due to its location change.
  - Update the platform of the slave.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunQtAPITests): Enable running WK2 API tests on Qt.
(RunQtAPITests.start):
(RunWebKit2Tests.start): Force pixel tests on the Qt Mountain Lion Release builder.
(BuildAndTestWebKit2Factory): Added. (Build WK1 and WK2 too, but run only WK2 tests.)

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146989 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fc15c540
......@@ -42,7 +42,7 @@
{ "name": "szeged-windows-1", "platform": "qt-win"},
{ "name": "szeged-windows-2", "platform": "qt-win"},
{ "name": "indt-mountainlion", "platform": "qt-mac"},
{ "name": "oslo-mountainlion", "platform": "qt-5.0-mac-wk2"},
{ "name": "google-windows-1", "platform": "chromium-win" },
{ "name": "google-windows-2", "platform": "chromium-win" },
......@@ -238,9 +238,9 @@
"slavenames": ["szeged-windows-2"]
},
{
"name": "Qt Mountain Lion Release", "type": "Build", "builddir": "qt-mountainlion-release",
"platform": "qt-mac", "configuration": "release", "architectures": ["x86_64"],
"slavenames": ["indt-mountainlion"]
"name": "Qt Mountain Lion Release", "type": "BuildAndTestWebKit2", "builddir": "qt-mountainlion-release",
"platform": "qt-5.0-mac-wk2", "configuration": "release", "architectures": ["x86_64"],
"slavenames": ["oslo-mountainlion"]
},
{
"name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release",
......
......@@ -598,10 +598,12 @@ class RunQtAPITests(shell.Test):
name = "API tests"
description = ["API tests running"]
descriptionDone = ["API tests"]
command = ["python", "./Tools/Scripts/run-qtwebkit-tests",
"--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=120",
WithProperties("WebKitBuild/%(configuration_pretty)s/Source/WebKit/qt/tests/", configuration_pretty=lambda build: build.getProperty("configuration").title())
]
def start(self):
self.setCommand( ["python", "./Tools/Scripts/run-qtwebkit-tests", "--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=120", "--%s" % self.getProperty('configuration')] )
if self.getProperty('fullPlatform').endswith("-wk2"):
self.setCommand(self.command + ['--webkit2'])
return shell.Test.start(self)
def commandComplete(self, cmd):
shell.Test.commandComplete(self, cmd)
......@@ -658,6 +660,9 @@ class RunWebKit2Tests(RunWebKitTests):
def start(self):
self.setProperty("shouldAbortEarly", False)
self.setCommand(self.command + ["--webkit-test-runner"])
if self.getProperty('buildername') == "Qt Mountain Lion Release":
self.setCommand(self.command + ["-p"])
return RunWebKitTests.start(self)
......@@ -856,6 +861,10 @@ class BuildAndTestFactory(Factory):
self.addStep(UploadBuiltProduct())
self.addStep(trigger.Trigger(schedulerNames=triggers))
class BuildAndTestWebKit2Factory(BuildAndTestFactory):
CompileClass = CompileWebKit
TestClass = RunWebKit2Tests
class BuildAndTestWebKit1OnlyFactory(BuildAndTestFactory):
CompileClass = CompileWebKit1Only
......
2013-03-27 Csaba Osztrogonác <ossy@webkit.org>
master.cfg fine-tuning for Qt Mountain Lion Release bot
https://bugs.webkit.org/show_bug.cgi?id=113191
Reviewed by Ryosuke Niwa.
* BuildSlaveSupport/build.webkit.org-config/config.json:
- Rename the slave due to its location change.
- Update the platform of the slave.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunQtAPITests): Enable running WK2 API tests on Qt.
(RunQtAPITests.start):
(RunWebKit2Tests.start): Force pixel tests on the Qt Mountain Lion Release builder.
(BuildAndTestWebKit2Factory): Added. (Build WK1 and WK2 too, but run only WK2 tests.)
2013-03-27 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 
[EFL][jhbuild] Evas fails to build when Wayland is present on the system
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment